fixed #1554: custom toolbar icon is not loaded

d2phap · Apr 21, 2023 · 6d8d5c1 · 6d8d5c1
1 parent 904198e
commit 6d8d5c1
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/v9/Components/ImageGlass.UI/Themes/IgTheme.cs b/v9/Components/ImageGlass.UI/Themes/IgTheme.cs
@@ -389,11 +389,18 @@ public Bitmap GetToolbarIcon(string? name)
         // get icon from theme pack icon name
         var icon = ToolbarIcons.GetType().GetProperty(name ?? string.Empty)?.GetValue(ToolbarIcons);
 
-        // set empty icon
-        icon ??= BHelper.CreateDefaultToolbarIcon(ToolbarActualIconHeight, Settings.IsDarkMode);
+        // load icon from custom file
+        try
+        {
+            icon = PhotoCodec.GetThumbnail(name, ToolbarActualIconHeight, ToolbarActualIconHeight);
+        }
+        catch
+        {
+            // set empty icon
+            icon ??= BHelper.CreateDefaultToolbarIcon(ToolbarActualIconHeight, Settings.IsDarkMode);
+        }
 
         return icon as Bitmap;
     }
 
-
 }