[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qt5 vcl/unx

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx         |    6 ------
 vcl/unx/kde4/KDESalFrame.cxx |    6 ------
 2 files changed, 12 deletions(-)

New commits:
commit 17fd7790f84d9bbdddc0ebcde20ed143cdc27a64
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Wed Dec 12 12:57:10 2018 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Jan 19 01:16:45 2019 +0100

    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 at fbihome.de>
    (cherry picked from commit 89c888b48eca24e25ffe8895542cf7ac9b731187)
    Reviewed-on: https://gerrit.libreoffice.org/65857
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 2b6ba5e47671358cbe44ba68000e13db22bd36db)
    Reviewed-on: https://gerrit.libreoffice.org/66611
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 955412073501..6441d7d244ea 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -847,12 +847,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));
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 7dde568a23b1..09a0e7866503 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -169,12 +169,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     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
     vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() );
     style.BatchSetFonts( aFont, aFont );