[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ef267dc5c1e46d236478ff32fc14925a0eeb0266
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Oct 20 21:01:31 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Oct 21 10:01:43 2020 +0200

    Qt5 use base color for workspace too
    
    This was uncovered by the fix for tdf#136555. The current color
    for the start center button bar is too dark.
    
    Regressed-by: a927e0964ba0442d53fffb22c577e54bcf183ed7
    Change-Id: I36356117f03255cfbf1fa24a6391cb81cf1883db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104578
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit e0c72e31c1d455c26110c35e8780d420e17cdea6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104589
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 768872fe8db0..eb39d6016bfa 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1022,7 +1022,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
     Color aText = toColor(pal.color(QPalette::Active, QPalette::Text));
     Color aBase = toColor(pal.color(QPalette::Active, QPalette::Base));
     Color aButn = toColor(pal.color(QPalette::Active, QPalette::ButtonText));
-    Color aMid = toColor(pal.color(QPalette::Active, QPalette::Mid));
     Color aHigh = toColor(pal.color(QPalette::Active, QPalette::Highlight));
     Color aHighText = toColor(pal.color(QPalette::Active, QPalette::HighlightedText));
     Color aLink = toColor(pal.color(QPalette::Active, QPalette::Link));
@@ -1046,6 +1045,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
     style.SetFieldColor(aBase);
     style.SetWindowColor(aBase);
     style.SetActiveTabColor(aBase);
+    style.SetWorkspaceColor(aBase);
     style.SetAlternatingRowColor(toColor(pal.color(QPalette::Active, QPalette::AlternateBase)));
 
     // Buttons
@@ -1077,9 +1077,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
     style.BatchSetBackgrounds(aBack);
     style.SetInactiveTabColor(aBack);
 
-    // Workspace
-    style.SetWorkspaceColor(aMid);
-
     // Selection
     style.SetHighlightColor(aHigh);
     style.SetHighlightTextColor(aHighText);