| commit | 66d3a5b78b7a7665a75047c87ac180eeb03b476f | [log] |
|---|---|---|
| author | Sumit Chauhan <sumitcn25@gmail.com> | Tue Dec 04 18:47:10 2018 +0530 |
| committer | Michael Weghorn <m.weghorn@posteo.de> | Mon Dec 31 00:56:17 2018 +0100 |
| tree | 4691f8c36059d37c7b095ee46f3bd73037050e3a | |
| parent | 100718aae14cbabd08f3b2a69256eb7055666f24 [diff] |
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@fbihome.de> (cherry picked from commit 3911bf8364dae4c855ad37237c114f9007f70657) Reviewed-on: https://gerrit.libreoffice.org/65560 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 230c983..ea43b16 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx
@@ -850,7 +850,7 @@ 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)));