diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-14 13:49:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-14 13:50:37 +0000 |
| commit | 6e32e575829160b3c51ebbb67231baec7135afd3 (patch) | |
| tree | 748090363b848a47d7931684c4eb07593678c841 /include | |
| parent | 32d0378284a42f0eba1df92555767a43be079117 (diff) | |
Resolves: tdf#103915 when global dark theme is set fall back to breeze_dark
otherwise don't assume a desired iconset ending in *dark means breeze_dark
is a good fallback
Change-Id: Ia294a86e17a2c390b503d5200dfc7195759afa00
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/IconThemeSelector.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/settings.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/vcl/IconThemeSelector.hxx b/include/vcl/IconThemeSelector.hxx index 70b000bbdc2e..0fcd66d1f263 100644 --- a/include/vcl/IconThemeSelector.hxx +++ b/include/vcl/IconThemeSelector.hxx @@ -63,7 +63,7 @@ public: SetUseHighContrastTheme(bool); void - SetPreferredIconTheme(const OUString&); + SetPreferredIconTheme(const OUString&, bool bDarkIconTheme); bool operator==(const vcl::IconThemeSelector&) const; @@ -85,6 +85,7 @@ private: OUString mPreferredIconTheme; bool mUseHighContrastTheme; + bool mPreferDarkIconTheme; friend class ::IconThemeSelectorTest; }; diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 74197f14c025..fd2881001e42 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -548,7 +548,7 @@ public: /** Set a preferred icon theme. * This theme will be preferred in GetAutomaticallyChosenIconTheme() */ - void SetPreferredIconTheme(const OUString&); + void SetPreferredIconTheme(const OUString&, bool bDarkIconTheme = false); const DialogStyle& GetDialogStyle() const; void SetDialogStyle( const DialogStyle& rStyle ); |