diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-04-16 13:46:08 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 07:25:37 (GMT) |
| commit | 92fb0247285c9ccf50935ce0aa7983ae4ac5b7c8 (patch) | |
| tree | 08fad6b7e17fad5694b4285150b5b8425ae93959 /src/gui/kernel | |
| parent | ebaf32ff5b28c3d7cd0c29e3a4a47063ef45d617 (diff) | |
| download | Qt-92fb0247285c9ccf50935ce0aa7983ae4ac5b7c8.zip Qt-92fb0247285c9ccf50935ce0aa7983ae4ac5b7c8.tar.gz Qt-92fb0247285c9ccf50935ce0aa7983ae4ac5b7c8.tar.bz2 | |
Windows: Add missing colors to tooltip palette.
Task-number: QTBUG-38183
Change-Id: Ic3581cc87c0d61140624ddaf6fa85d682120ad4f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
(cherry picked from qtbase/9fc0c5466238eb8f43d2736d298ac36c65da529e)
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 9bc6cfc..276d73a 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -586,6 +586,7 @@ static void qt_set_windows_color_resources() QPalette tiplabel(pal); tiplabel.setColor(QPalette::All, QPalette::Button, ttip); tiplabel.setColor(QPalette::All, QPalette::Window, ttip); + tiplabel.setColor(QPalette::All, QPalette::ToolTipBase, ttip); tiplabel.setColor(QPalette::All, QPalette::Text, ttipText); tiplabel.setColor(QPalette::All, QPalette::WindowText, ttipText); tiplabel.setColor(QPalette::All, QPalette::ButtonText, ttipText); @@ -594,12 +595,15 @@ static void qt_set_windows_color_resources() tiplabel.setColor(QPalette::All, QPalette::Text, ttipText); tiplabel.setColor(QPalette::All, QPalette::WindowText, ttipText); tiplabel.setColor(QPalette::All, QPalette::ButtonText, ttipText); + tiplabel.setColor(QPalette::All, QPalette::ToolTipText, ttipText); const QColor fg = tiplabel.foreground().color(), btn = tiplabel.button().color(); QColor disabled((fg.red()+btn.red())/2,(fg.green()+btn.green())/2, (fg.blue()+btn.blue())/2); tiplabel.setColor(QPalette::Disabled, QPalette::WindowText, disabled); + tiplabel.setColor(QPalette::Disabled, QPalette::ToolTipText, disabled); tiplabel.setColor(QPalette::Disabled, QPalette::Text, disabled); tiplabel.setColor(QPalette::Disabled, QPalette::Base, Qt::white); + tiplabel.setColor(QPalette::Disabled, QPalette::ToolTipBase, Qt::white); tiplabel.setColor(QPalette::Disabled, QPalette::BrightText, Qt::white); QToolTip::setPalette(tiplabel); #endif //QT_NO_TOOLTIP |