diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-21 11:10:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-22 12:03:37 +0000 |
| commit | 8788eedc25b986c1a45cb3cb04c967df94e73394 (patch) | |
| tree | b9e5c439c37ea3f88da14212d9ae7d3d0464cedb | |
| parent | b830788f584619ed6b51b9c207347e229dafcd2b (diff) | |
Default: make ToolTip use palettes
Task-number: QTBUG-63331
Change-Id: I42232ab2dc270b5a68bcf967517b2a00d3aad666
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/ToolTip.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index d4294861..7682c07e 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -58,10 +58,12 @@ T.ToolTip { contentItem: Text { text: control.text font: control.font + color: control.palette.toolTipText // TODO: wrapMode: Label.Wrap } background: Rectangle { - border.color: Default.frameDarkColor + border.color: control.palette.dark + color: control.palette.toolTipBase } } diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index c2ea2865..93ed2a90 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -47,6 +47,8 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::BrightText, QColor::fromRgba(0xFFFFFFFF)); systemPalette.setColor(QPalette::Disabled, QPalette::BrightText, QColor::fromRgba(0x4DFFFFFF)); + systemPalette.setColor(QPalette::Dark, QColor::fromRgba(0xFF353637)); + systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF)); systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF)); @@ -57,6 +59,9 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); + systemPalette.setColor(QPalette::ToolTipBase, QColor::fromRgba(0xFFFFFFFF)); + systemPalette.setColor(QPalette::ToolTipText, QColor::fromRgba(0xFF000000)); + systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A)); systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF)); |