iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix highlight issues with Qt5

Browse Source
This commit is contained in:
Craig Drummond
2015-12-06 17:04:28 +00:00
committed by Craig Drummond
parent 3446a0df41
commit 9de9832385
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
support/fancytabwidget.cpp
View File

@@ -535,6 +535,9 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex, bool gtkStyle) const
}
}
selected = selected && (palette().currentColorGroup()==QPalette::Active ||
(palette().highlightedText().color()==palette().brush(QPalette::Active, QPalette::HighlightedText).color()));
if (withText) {
QString tabText(painter->fontMetrics().elidedText(this->tabText(tabIndex), elideMode(), width()));
QRect tabTextRect(tabRect(tabIndex));
@@ -545,22 +548,16 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex, bool gtkStyle) const
#ifdef Q_OS_MAC
painter->setPen(selected ? OSXStyle::self()->viewPalette().highlightedText().color() : OSXStyle::self()->viewPalette().foreground().color());
#else
// painter->setPen(selected ? QApplication::palette().highlightedText().color() : palette().foreground().color());
painter->setPen(selected && styleOpt.state&QStyle::State_Active
? QApplication::palette().highlightedText().color() : QApplication::palette().foreground().color());
painter->setPen(selected ? QApplication::palette().highlightedText().color() : QApplication::palette().foreground().color());
#endif
int textFlags = Qt::AlignCenter | Qt::AlignBottom;
painter->drawText(tabTextRect, textFlags, tabText);
const int textHeight = painter->fontMetrics().height();
tabIconRect.adjust(0, 4, 0, -textHeight);
drawIcon(tabIcon(tabIndex), tabIconRect, painter, QSize(icnSize, icnSize),
selected && (palette().currentColorGroup()==QPalette::Active ||
(palette().highlightedText().color()==palette().brush(QPalette::Active, QPalette::HighlightedText).color())));
drawIcon(tabIcon(tabIndex), tabIconRect, painter, QSize(icnSize, icnSize), selected);
} else {
drawIcon(tabIcon(tabIndex), rect, painter, QSize(icnSize, icnSize),
selected && (palette().currentColorGroup()==QPalette::Active ||
(palette().highlightedText().color()==palette().brush(QPalette::Active, QPalette::HighlightedText).color())));
drawIcon(tabIcon(tabIndex), rect, painter, QSize(icnSize, icnSize), selected);
}
painter->restore();