summaryrefslogtreecommitdiff
path: root/vcl/qt5/Qt5Frame.cxx
diff options
context:
space:
mode:
authorIgor Poboiko <igor.poboiko@gmail.com>2020-05-22 16:32:27 +0300
committerKatarina Behrens <bubli@bubli.org>2020-06-24 11:32:56 +0200
commit584eba1fec6a47f4aae69afbdec7fc761bb68d29 (patch)
tree646fd434d3056b49f4694924c7d2bd2691f06263 /vcl/qt5/Qt5Frame.cxx
parent6038fa25aa38bb1523ecd9e5adac3b96cbc52ffd (diff)
tdf#127138: Fix detection of system icon theme with Qt5/KF5
The title is self-explanatory. The QIcon::themeName() actually uses Qt Platform Abstraction plugins, i.e. it's aware of KDE preferred icon theme via Qt Plasma integration module. (note that it is _currently_ broken due to KDE bug https://bugs.kde.org/show_bug.cgi?id=402172, which causes themeName to return empty string; however, it's being worked on) Change-Id: Ibc7cf9ee9ae73b492046219487760561d7d2ea45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94691 Tested-by: Jenkins Reviewed-by: Katarina Behrens <bubli@bubli.org>
Diffstat (limited to 'vcl/qt5/Qt5Frame.cxx')
-rw-r--r--vcl/qt5/Qt5Frame.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index daa930ff6b82..ed3368ac3970 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1130,6 +1130,9 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
}
style.SetMenuBarHighlightTextColor(style.GetMenuHighlightTextColor());
+ // Icon theme
+ style.SetPreferredIconTheme(toOUString(QIcon::themeName()));
+
// Scroll bar size
style.SetScrollBarSize(QApplication::style()->pixelMetric(QStyle::PM_ScrollBarExtent));
style.SetMinThumbSize(QApplication::style()->pixelMetric(QStyle::PM_ScrollBarSliderMin));