kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-08-03 20:56:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tab Title Align Incorrectly in RTL Layout

Browse Source 
Alignment depends on application layout.
This commit is contained in:
ShaopengLin 2024-07-21 01:20:19 -04:00
parent f53d7adb1d
commit 848618e5d3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tabbar.cpp
View File

@ -422,6 +422,8 @@ void TabBar::paintEvent(QPaintEvent *e)
initStyleOption(&tabopt, i);
bool need_fade_out = false;
bool textRightToLeft = tab_title.isRightToLeft();
bool appRightToLeft = QWidget::isRightToLeft();
QRect tabTextRect = style()->subElementRect(QStyle::SE_TabBarTabText, &tabopt, this);
@ -430,8 +432,6 @@ void TabBar::paintEvent(QPaintEvent *e)
if (fontTextRect.width() > tabTextRect.width())
need_fade_out = true;
bool right_to_left = tab_title.isRightToLeft();
if (need_fade_out) {
// draw the most of tab text extent with the normal color,
// and draw the rest with alpha channel gradient
@ -444,7 +444,7 @@ void TabBar::paintEvent(QPaintEvent *e)
const int mid_Y = tabTextRect.center().y();
QLinearGradient gr;
if (right_to_left) {
if (textRightToLeft) {
// arabic right-to-left text
gr.setStart(tabTextRect.x(), mid_Y);
gr.setFinalStop(tabTextRect.x() + 0.2 * tabTextRect.width(), mid_Y);
@ -463,7 +463,13 @@ void TabBar::paintEvent(QPaintEvent *e)
int align = Qt::AlignVCenter;
if (need_fade_out) {
align |= (right_to_left)? Qt::AlignRight : Qt::AlignLeft;
/*
We align LTR text in LTR app to the left, while RTL text in RTL app
to the right. Since Qt mirror alignment, we can simply do ALignLeft
for both cases. When text and app direction doesn't match, we flip
the text alignment.
*/
align |= (textRightToLeft == appRightToLeft) ? Qt::AlignLeft : Qt::AlignRight;
}
style()->drawItemText(&p, tabTextRect, align,