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

Merge pull request #1146 from kiwix/Issue#594-right-to-left-layout

Browse Source 
Fixed Tab and Bookmark Right to Left Layout Drawing
This commit is contained in:
Kelson 2024-08-07 20:20:44 +00:00 committed by GitHub
commit 9418f64d5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/css/style.css
View File

@ -69,7 +69,8 @@ SearchBar > QToolButton {
}
SearchBar > BookmarkButton {
margin-right: 4px;
margin-right: 3px;
margin-left: 3px;
}
SearchBar > QToolButton:pressed,
@ -175,16 +176,17 @@ QTabWidget::pane {
border-top: 1px solid #ccc;
}
/* paintEvent of src/tabbar.cpp references the value of border and padding */
QTabBar::tab {
border: none;
border-right: 1px solid #ccc;
border: 1px solid #ccc;
border-radius: 0;
padding: 2px;
padding: 4px;
padding-top: 6px;
}
QTabBar::tab:selected {
background-color: white;
border-bottom: 2px solid white;
border-bottom: 1px solid white;
}
QTabBar::tab:first {
@ -192,10 +194,6 @@ QTabBar::tab:first {
padding-left: 5px;
}
QTabBar::tab:last {
border: none;
}
QTabBar::tab:last QToolButton {
font-size: 30px;
width: 30px; min-width: 30px; max-width: 30px;

28
src/tabbar.cpp
View File

@ -422,16 +422,30 @@ void TabBar::paintEvent(QPaintEvent *e)
initStyleOption(&tabopt, i);
bool need_fade_out = false;
bool textRightToLeft = tab_title.isRightToLeft();
bool appRightToLeft = QWidget::isRightToLeft();
// See QTabBar::tab::padding value in resources/css/style.css
const int padding = 4;
QRect tabTextRect = style()->subElementRect(QStyle::SE_TabBarTabText, &tabopt, this);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// See QTabBar::tab::border value in resources/css/style.css
const int border = 1;
// Add Padding to left, right. Padding is 4px. Add 5 to account for
// Extra pixel from border.
tabTextRect.setX(tabTextRect.x() + padding + border);
tabTextRect.setWidth(tabTextRect.width() - padding - border);
#else
// Qt6 correctly adds left and right padding but now incorrectly adds
// top or bottom padding.
tabTextRect.setY(tabTextRect.y() - padding);
#endif
QRect fontTextRect = fontMetrics().boundingRect(tab_title);
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 +458,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 +477,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,