CloseButton: Use Gala.Icon

Author: leolost2605

lib/CloseButton.vala

@@ -11,8 +11,7 @@ public class Gala.CloseButton : Clutter.Actor {
 
     public float monitor_scale { get; construct set; }
 
-    // used to avoid changing hitbox of the button
-    private Clutter.Actor pixbuf_actor;
+    private Icon icon;
     private Clutter.ClickAction click_action;
 
     static construct {
@@ -26,18 +25,18 @@ public class Gala.CloseButton : Clutter.Actor {
     construct {
         reactive = true;
 
-        pixbuf_actor = new Clutter.Actor () {
+        icon = new Icon.from_resource (
+            Utils.BUTTON_SIZE, monitor_scale,
+            "/org/pantheon/desktop/gala/buttons/close.svg"
+        ) {
             pivot_point = { 0.5f, 0.5f }
         };
-        add_child (pixbuf_actor);
+        add_child (icon);
 
         click_action = new Clutter.ClickAction ();
         add_action (click_action);
         click_action.clicked.connect (on_clicked);
         click_action.notify["pressed"].connect (on_pressed_changed);
-
-        load_pixbuf ();
-        notify["monitor-scale"].connect (load_pixbuf);
     }
 
     private void on_clicked () {
@@ -48,53 +47,10 @@ public class Gala.CloseButton : Clutter.Actor {
         var estimated_duration = Utils.get_animation_duration ((uint) (ANIMATION_DURATION * (scale_x - 0.8) / 0.2));
         var scale = click_action.pressed ? 0.8 : 1.0;
 
-        pixbuf_actor.save_easing_state ();
-        pixbuf_actor.set_easing_duration (estimated_duration);
-        pixbuf_actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT);
-        pixbuf_actor.set_scale (scale, scale);
-        pixbuf_actor.restore_easing_state ();
-    }
-
-    private void load_pixbuf () {
-        var pixbuf = get_close_button_pixbuf (monitor_scale);
-        if (pixbuf != null) {
-            var image = new Gala.Image.from_pixbuf (pixbuf);
-            pixbuf_actor.set_content (image);
-            pixbuf_actor.set_size (pixbuf.width, pixbuf.height);
-            set_size (pixbuf.width, pixbuf.height);
-        } else {
-            create_error_texture ();
-        }
-    }
-
-    private static Gdk.Pixbuf? get_close_button_pixbuf (float monitor_scale) {
-        var height = Utils.calculate_button_size (monitor_scale);
-
-        if (close_pixbufs[height] == null) {
-            try {
-                close_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale (
-                    "/org/pantheon/desktop/gala/buttons/close.svg",
-                    -1,
-                    height,
-                    true
-                );
-            } catch (Error e) {
-                critical (e.message);
-                return null;
-            }
-        }
-
-        return close_pixbufs[height];
-    }
-
-    private void create_error_texture () {
-        // we'll just make this red so there's at least something as an
-        // indicator that loading failed. Should never happen and this
-        // works as good as some weird fallback-image-failed-to-load pixbuf
-        critical ("Could not create close button");
-
-        var size = Utils.calculate_button_size (monitor_scale);
-        pixbuf_actor.set_size (size, size);
-        pixbuf_actor.background_color = { 255, 0, 0, 255 };
+        icon.save_easing_state ();
+        icon.set_easing_duration (estimated_duration);
+        icon.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT);
+        icon.set_scale (scale, scale);
+        icon.restore_easing_state ();
     }
 }

lib/Utils.vala

@@ -17,7 +17,7 @@
 
 namespace Gala {
     public class Utils {
-        private const int BUTTON_SIZE = 36;
+        public const int BUTTON_SIZE = 36;
 
         private struct CachedIcon {
             public Gdk.Pixbuf icon;