diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-12 12:57:10 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-12 18:08:21 +0100 |
| commit | 89c888b48eca24e25ffe8895542cf7ac9b731187 (patch) | |
| tree | b344594fd1e9a032c863debeb24db699d5c3fc42 /vcl/qt5/Qt5Frame.cxx | |
| parent | 588f1cca15462a28fff7d983cdd991f2a96d1ca0 (diff) | |
Qt5+kde4 don't override generic VCL style settings
In commit 3911bf8364da ("tdf#98253 Qt5 rely on VCL for
SetDeactiveColor") the named was dropped from the Qt5 styling.
This results in SetDeactiveColor now being controlled by LO,
but SetActiveColor by the Qt theming.
But IMHO both need to be managed together in some way, as the
deactive color is normally some variant of active with a lower
opacity.
Also no other backends except Windows and headless even
overide the four general colors Set(De|A)ctive(Text)?Color and
Windows is setting them from the window decorations (CAPTION)?!
So let's get rid of all these settings for Qt5 and kde4.
Change-Id: Id9497dc067e4718d25d24c5795589b6c028a8817
Reviewed-on: https://gerrit.libreoffice.org/65028
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/qt5/Qt5Frame.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index c123e8e638ee..87637916fe79 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -836,12 +836,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings) style.SetToolbarIconSize(ToolbarIconSize::Large); - style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window))); - // rely on VCL for style.SetDeactiveColor - - style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText))); - style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText))); - Color aFore = toColor(pal.color(QPalette::Active, QPalette::WindowText)); Color aBack = toColor(pal.color(QPalette::Active, QPalette::Window)); Color aText = toColor(pal.color(QPalette::Active, QPalette::Text)); |