Kaydet (Commit) 89c888b4 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

Qt5+kde4 don't override generic VCL style settings

In commit 3911bf83 ("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: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
üst 588f1cca
...@@ -836,12 +836,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings) ...@@ -836,12 +836,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
style.SetToolbarIconSize(ToolbarIconSize::Large); 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 aFore = toColor(pal.color(QPalette::Active, QPalette::WindowText));
Color aBack = toColor(pal.color(QPalette::Active, QPalette::Window)); Color aBack = toColor(pal.color(QPalette::Active, QPalette::Window));
Color aText = toColor(pal.color(QPalette::Active, QPalette::Text)); Color aText = toColor(pal.color(QPalette::Active, QPalette::Text));
......
...@@ -170,12 +170,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -170,12 +170,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetToolbarIconSize( ToolbarIconSize::Large ); style.SetToolbarIconSize( ToolbarIconSize::Large );
style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window)));
style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText)));
style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
// Font // Font
vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() );
style.BatchSetFonts( aFont, aFont ); style.BatchSetFonts( aFont, aFont );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment