1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtWidgets: Fix white text color on tabs on macOS for non-macOS styles

Browse Source 
Apply white text only for macOS style.

Amends 2c0033983bc53e906eab3f4b2fae836ff8472713

Task-number: QTBUG-59784
Change-Id: I9e66e929699efd715ed4565394f1aba763aeb32a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Błażej Szczygieł 2017-03-28 21:31:37 +02:00
parent b387257261
commit 2fbc143202
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/widgets/qtabbar.cpp
View File

@ -176,12 +176,11 @@ void QTabBarPrivate::initBasicStyleOption(QStyleOptionTab *option, int tabIndex)
if (tab.textColor.isValid()) if (tab.textColor.isValid())
option->palette.setColor(q->foregroundRole(), tab.textColor); option->palette.setColor(q->foregroundRole(), tab.textColor);
#ifdef Q_OS_MACOS else if (q->style()->inherits("QMacStyle")
else if (isCurrent && !documentMode && isCurrent && !documentMode
&& (QSysInfo::MacintoshVersion < QSysInfo::MV_10_10 || q->isActiveWindow())) { && (QSysInfo::MacintoshVersion < QSysInfo::MV_10_10 || q->isActiveWindow())) {
option->palette.setColor(QPalette::WindowText, Qt::white); option->palette.setColor(QPalette::WindowText, Qt::white);
} }
#endif
option->icon = tab.icon; option->icon = tab.icon;
option->iconSize = q->iconSize(); // Will get the default value then. option->iconSize = q->iconSize(); // Will get the default value then.