[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 23:56:39 UTC 2018
vcl/qt5/Qt5Frame.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 66d3a5b78b7a7665a75047c87ac180eeb03b476f
Author: Sumit Chauhan <sumitcn25 at gmail.com>
AuthorDate: Tue Dec 4 18:47:10 2018 +0530
Commit: Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Dec 31 00:56:17 2018 +0100
tdf#98253 Qt5 rely on VCL for SetDeactiveColor
Keep the DeactiveColor from generic vcl style without overriding it
with the Qt5 style.
Change-Id: I10ffdc79e1b6878d27ae13c6394ad50d7470f073
Reviewed-on: https://gerrit.libreoffice.org/64522
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit 3911bf8364dae4c855ad37237c114f9007f70657)
Reviewed-on: https://gerrit.libreoffice.org/65560
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 230c98395a70..ea43b16abd0f 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -850,7 +850,7 @@ void Qt5Frame::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)));
+ // rely on VCL for style.SetDeactiveColor
style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText)));
style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
More information about the Libreoffice-commits
mailing list