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

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;
 };

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 );

vcl/source/app/IconThemeSelector.cxx

@@ -43,7 +43,8 @@ bool icon_theme_is_in_installed_themes(const OUString& theme,
 } // end anonymous namespace
 
 IconThemeSelector::IconThemeSelector()
-: mUseHighContrastTheme(false)
+    : mUseHighContrastTheme(false)
+    , mPreferDarkIconTheme(false)
 {
 }
 
@@ -83,7 +84,7 @@ IconThemeSelector::SelectIconThemeForDesktopEnvironment(
             return mPreferredIconTheme;
         }
         //if a dark variant is preferred, and we didn't have an exact match, then try our one and only dark theme
-        if (mPreferredIconTheme.endsWith("_dark") && icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
+        if (mPreferDarkIconTheme && icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
             return OUString("breeze_dark");
         }
     }
@@ -121,9 +122,10 @@ IconThemeSelector::SetUseHighContrastTheme(bool v)
 }
 
 void
-IconThemeSelector::SetPreferredIconTheme(const OUString& theme)
+IconThemeSelector::SetPreferredIconTheme(const OUString& theme, bool bDarkIconTheme)
 {
     mPreferredIconTheme = theme;
+    mPreferDarkIconTheme = bDarkIconTheme;
 }
 
 bool
@@ -135,6 +137,9 @@ IconThemeSelector::operator==(const vcl::IconThemeSelector& other) const
     if (mPreferredIconTheme != other.mPreferredIconTheme) {
         return false;
     }
+    if (mPreferDarkIconTheme != other.mPreferDarkIconTheme) {
+        return false;
+    }
     if (mUseHighContrastTheme != other.mUseHighContrastTheme) {
         return false;
     }

vcl/source/app/settings.cxx

@@ -3026,9 +3026,9 @@ StyleSettings::GetHighContrastMode() const
 }
 
 void
-StyleSettings::SetPreferredIconTheme(const OUString& theme)
+StyleSettings::SetPreferredIconTheme(const OUString& theme, bool bDarkIconTheme)
 {
-    mxData->mIconThemeSelector->SetPreferredIconTheme(theme);
+    mxData->mIconThemeSelector->SetPreferredIconTheme(theme, bDarkIconTheme);
 }
 
 void

vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx

@@ -2726,14 +2726,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
                             "gtk-application-prefer-dark-theme", &bDarkIconTheme,
                             nullptr );
     OUString sIconThemeName(OUString::createFromAscii(pIconThemeName));
-    if (sIconThemeName.endsWithIgnoreAsciiCase("-dark", &sIconThemeName) ||
-        sIconThemeName.endsWithIgnoreAsciiCase("_dark", &sIconThemeName))
-    {
-        bDarkIconTheme = true;
-    }
-    if (bDarkIconTheme)
-        sIconThemeName += "_dark";
-    aStyleSet.SetPreferredIconTheme(sIconThemeName);
+    aStyleSet.SetPreferredIconTheme(sIconThemeName, bDarkIconTheme);
     g_free( pIconThemeName );
 
     aStyleSet.SetToolbarIconSize( ToolbarIconSize::Large );