panel-launchers: Don't allow the size of custom icons to be reset.

When the theme changed, _updateIconSize would compare the current
icon size with smallest of either its container's height or its
width.

Only one direction would be set (depending on panel orientation),
so the smallest size was always 0, resetting the StIcon's icon_size
property to 0. This would force it to look at the theme for the
icon size (which would be too large for the panel).

Author: mtwebster

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -282,12 +282,22 @@ class PanelAppLauncher extends DND.LauncherDraggable {
 
     _updateIconSize() {
         let node = this._iconBox.get_theme_node();
-        let maxHeight = this._iconBox.height - node.get_vertical_padding();
-        let maxWidth = this._iconBox.width - node.get_horizontal_padding();
-        let smallestDim = Math.min(maxHeight, maxWidth) / global.ui_scale;
+        let enforcedSize = 0;
 
-        if (smallestDim < this.icon.get_icon_size()) {
-            this.icon.set_icon_size(smallestDim);
+        if (this._iconBox.height > 0) {
+            enforcedSize = this._iconBox.height - node.get_vertical_padding();
+        }
+        else
+        if (this._iconBox.width > 0) {
+            enforcedSize = this._iconBox.width - node.get_horizontal_padding();
+        }
+        else
+        {
+            enforcedSize = -1;
+        }
+
+        if (enforcedSize < this.icon.get_icon_size()) {
+            this.icon.set_icon_size(enforcedSize);
         }
     }
 

src/cinnamon-app.c

@@ -188,7 +188,7 @@ get_actor_for_icon_name (CinnamonApp *app,
 
   if (icon != NULL)
   {
-    actor = g_object_new (ST_TYPE_ICON, "gicon", icon, "icon-size", size, NULL);
+    actor = g_object_new (ST_TYPE_ICON, "gicon", icon, "icon-type", ST_ICON_FULLCOLOR, "icon-size", size, NULL);
     g_object_unref (icon);
   }
 
@@ -199,7 +199,7 @@ static ClutterActor *
 get_failsafe_icon (int size)
 {
   GIcon *icon = g_themed_icon_new ("application-x-executable");
-  ClutterActor *actor = g_object_new (ST_TYPE_ICON, "gicon", icon, "icon-size", size, NULL);
+  ClutterActor *actor = g_object_new (ST_TYPE_ICON, "gicon", icon, "icon-type", ST_ICON_FULLCOLOR, "icon-size", size, NULL);
   g_object_unref (icon);
   return actor;
 }