Merge branch 'main' into lenemter/introduce-property-animator

Author: lenemter

lib/Gestures/ActorTarget.vala

@@ -84,6 +84,7 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
         switch (update_type) {
             case START:
                 ongoing_animations++;
+                notify_property ("animating");
                 start_progress (action);
                 break;
             case UPDATE:
@@ -94,6 +95,7 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
                 break;
             case END:
                 ongoing_animations--;
+                notify_property ("animating");
                 end_progress (action);
                 break;
         }

lib/Gestures/TouchpadBackend.vala

@@ -56,11 +56,12 @@ private class Gala.TouchpadBackend : Object, GestureBackend {
             return Clutter.EVENT_PROPAGATE;
         }
 
-        if (state == IGNORED) {
-            if (event.get_gesture_phase () == END || event.get_gesture_phase () == CANCEL) {
-                reset ();
-            }
+        if (state != ONGOING && (event.get_gesture_phase () == END || event.get_gesture_phase () == CANCEL)) {
+            reset ();
+            return Clutter.EVENT_PROPAGATE;
+        }
 
+        if (state == IGNORED) {
             return Clutter.EVENT_PROPAGATE;
         }
 

lib/Utils.vala

@@ -486,5 +486,24 @@ namespace Gala {
         public static int calculate_button_size (float monitor_scale) {
             return Utils.scale_to_int (BUTTON_SIZE, monitor_scale);
         }
+
+        private static bool? framebuffer_is_logical = null;
+        public static bool get_framebuffer_is_logical () {
+            if (framebuffer_is_logical != null) {
+                return framebuffer_is_logical;
+            }
+
+            framebuffer_is_logical = false;
+
+            var experimental_features = new Settings ("org.gnome.mutter").get_strv ("experimental-features");
+            for (var i = 0; i < experimental_features.length; i++) {
+                if (experimental_features[i] == "scale-monitor-framebuffer") {
+                    framebuffer_is_logical = true;
+                    break;
+                }
+            }
+
+            return framebuffer_is_logical;
+        }
     }
 }

src/BlurManager.vala

@@ -32,22 +32,13 @@ public class Gala.BlurManager : Object {
 
     public WindowManagerGala wm { get; construct; }
 
-    private bool framebuffer_is_logical = false;
     private GLib.HashTable<Meta.Window, BlurData?> blurred_windows = new GLib.HashTable<Meta.Window, BlurData?> (null, null);
 
     private BlurManager (WindowManagerGala wm) {
         Object (wm: wm);
     }
 
     construct {
-        var experimental_features = new Settings ("org.gnome.mutter").get_strv ("experimental-features");
-        for (var i = 0; i < experimental_features.length; i++) {
-            if (experimental_features[i] == "scale-monitor-framebuffer") {
-                framebuffer_is_logical = true;
-                break;
-            }
-        }
-
         wm.get_display ().window_created.connect ((window) => {
             window.notify["mutter-hints"].connect ((obj, pspec) => parse_mutter_hints ((Meta.Window) obj));
             parse_mutter_hints (window);
@@ -83,7 +74,7 @@ public class Gala.BlurManager : Object {
         var x_shadow_size = frame_rect.x - buffer_rect.x;
         var y_shadow_size = frame_rect.y - buffer_rect.y;
 
-        var monitor_scale = framebuffer_is_logical ? 1.0f : window.display.get_monitor_scale (window.get_monitor ());
+        var monitor_scale = Utils.get_framebuffer_is_logical () ? 1.0f : window.display.get_monitor_scale (window.get_monitor ());
         var inverse_monitor_scale = 1.0f / monitor_scale;
 
         blur_data.actor.set_position (

src/Widgets/MultitaskingView/Tooltip.vala

@@ -8,6 +8,9 @@
  * Clutter actor to display text in a tooltip-like component.
  */
 public class Gala.Tooltip : Clutter.Actor {
+    private const int TEXT_MARGIN = 6;
+    private const int CORNER_RADIUS = 3;
+
     public float monitor_scale { get; construct set; }
 
     private Gala.Text text_actor;
@@ -18,25 +21,33 @@ public class Gala.Tooltip : Clutter.Actor {
 
     construct {
         text_actor = new Gala.Text () {
-            margin_left = 6,
-            margin_top = 6,
-            margin_bottom = 6,
-            margin_right = 6,
             ellipsize = Pango.EllipsizeMode.MIDDLE,
             color = Drawing.Color.TOOLTIP_TEXT_COLOR
         };
-
-        add_child (text_actor);
+        bind_property ("monitor-scale", text_actor, "margin-left", SYNC_CREATE, transform_monitor_scale_to_margin);
+        bind_property ("monitor-scale", text_actor, "margin-top", SYNC_CREATE, transform_monitor_scale_to_margin);
+        bind_property ("monitor-scale", text_actor, "margin-right", SYNC_CREATE, transform_monitor_scale_to_margin);
+        bind_property ("monitor-scale", text_actor, "margin-bottom", SYNC_CREATE, transform_monitor_scale_to_margin);
 
         layout_manager = new Clutter.BinLayout ();
         background_color = Drawing.Color.TOOLTIP_BACKGROUND;
+        add_child (text_actor);
 
-        var rounded_corners_effect = new RoundedCornersEffect (3, monitor_scale);
+        var rounded_corners_effect = new RoundedCornersEffect (CORNER_RADIUS, monitor_scale);
         bind_property ("monitor-scale", rounded_corners_effect, "monitor-scale");
         add_effect (rounded_corners_effect);
     }
 
     public void set_text (string new_text) {
         text_actor.text = new_text;
     }
+
+    private static bool transform_monitor_scale_to_margin (Binding binding, Value from_value, ref Value to_value) {
+        to_value.set_float (
+            Utils.get_framebuffer_is_logical ()
+            ? TEXT_MARGIN
+            : Utils.scale_to_int (TEXT_MARGIN, from_value.get_float ())
+        );
+        return true;
+    }
 }

src/Widgets/MultitaskingView/WindowClone.vala

@@ -72,7 +72,6 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
     private Clutter.Clone? drag_handle = null;
 
     private ulong check_confirm_dialog_cb = 0;
-    private bool in_slot_animation = false;
 
     private Clutter.Actor clone_container;
     private Gala.CloseButton close_button;
@@ -142,7 +141,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         };
         bind_property ("monitor-scale", close_button, "monitor-scale");
         close_button.triggered.connect (close_window);
-        close_button.notify["has-pointer"].connect (() => update_hover_widgets ());
+        close_button.notify["has-pointer"].connect (update_hover_widgets);
 
         add_child (active_shape);
         add_child (clone_container);
@@ -157,7 +156,8 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         window.notify["title"].connect (() => window_title.set_text (window.get_title () ?? ""));
         window_title.set_text (window.get_title () ?? "");
 
-        notify["has-pointer"].connect (() => update_hover_widgets ());
+        notify["has-pointer"].connect (update_hover_widgets);
+        notify["animating"].connect (update_hover_widgets);
     }
 
     ~WindowClone () {
@@ -272,12 +272,8 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         add_target (new PropertyTarget (MULTITASKING_VIEW, window_title, "opacity", typeof (uint), 0u, 255u));
     }
 
-    public override void start_progress (GestureAction action) {
-        update_hover_widgets (true);
-    }
-
     public override void update_progress (Gala.GestureAction action, double progress) {
-        if (action != CUSTOM || slot == null || !Meta.Prefs.get_gnome_animations ()) {
+        if (action != CUSTOM || !has_pointer || slot == null || !Meta.Prefs.get_gnome_animations ()) {
             return;
         }
 
@@ -298,8 +294,6 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
     }
 
     public override void end_progress (GestureAction action) {
-        update_hover_widgets (false);
-
         if (action == CUSTOM && get_current_commit (CUSTOM) > 0.5 && Meta.Prefs.get_gnome_animations ()) {
             close_window (Meta.CURRENT_TIME);
         }
@@ -376,14 +370,10 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         return Clutter.EVENT_STOP;
     }
 
-    private void update_hover_widgets (bool? animating = null) {
-        if (animating != null) {
-            in_slot_animation = animating;
-        }
-
+    private void update_hover_widgets () {
         var duration = Utils.get_animation_duration (FADE_ANIMATION_DURATION);
 
-        var show = (has_pointer || close_button.has_pointer) && !in_slot_animation;
+        var show = (has_pointer || close_button.has_pointer) && !animating;
 
         close_button.save_easing_state ();
         close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);