TODO SUQASH THIS SHIT

leolost2605 · leolost2605 · commit 976dc595198f · 2024-10-17T01:02:30.000+02:00
diff --git a/lib/Utils.vala b/lib/Utils.vala
@@ -17,47 +17,6 @@
 
 namespace Gala {
     public class Utils {
-        /**
-         * Represents a size as an object in order for it to be updatable.
-         * Additionally it has some utilities like {@link Gala.Utils.Size.actor_tracking}.
-         */
-        public class Size {
-            public float width;
-            public float height;
-
-            public Size (float width, float height) {
-                this.width = width;
-                this.height = height;
-            }
-
-            /**
-             * Constructs a new size that will keep in sync with the width and height of an actor.
-             */
-            public Size.actor_tracking (Clutter.Actor actor) {
-                actor.notify["width"].connect ((obj, pspec) => width = ((Clutter.Actor) obj).width);
-                actor.notify["height"].connect ((obj, pspec) => height = ((Clutter.Actor) obj).height);
-
-                width = actor.width;
-                height = actor.height;
-            }
-
-            private Meta.Display? display;
-
-            public Size.primary_monitor_tracking (Meta.Display _display) {
-                display = _display;
-
-                set_size_from_monitor (display, display.get_primary_monitor ());
-                display.get_context ().get_backend ().get_monitor_manager ().monitors_changed.connect (() =>
-                    set_size_from_monitor (display, display.get_primary_monitor ()));
-            }
-
-            public void set_size_from_monitor (Meta.Display display, int monitor_index) {
-                var rect = display.get_monitor_geometry (monitor_index);
-                width = rect.width;
-                height = rect.height;
-            }
-        }
-
         private struct CachedIcon {
             public Gdk.Pixbuf icon;
             public int icon_size;
diff --git a/src/Gestures/GestureTracker.vala b/src/Gestures/GestureTracker.vala
@@ -154,8 +154,8 @@ public class Gala.GestureTracker : Object {
      * (height for {@link GestureDirection.UP} or DOWN, width for LEFT or RIGHT). If set to null the size of the
      * actor will be used. If the values change those changes will apply.
      */
-    public void enable_pan (Clutter.Actor actor, Utils.Size? travel_distances) {
-        pan_backend = new PanBackend (actor, travel_distances);
+    public void enable_pan (Clutter.Actor actor, owned PanBackend.GetTravelDistance travel_distance_func) {
+        pan_backend = new PanBackend (actor, (owned) travel_distance_func);
         pan_backend.on_gesture_detected.connect (gesture_detected);
         pan_backend.on_begin.connect ((percentage, time) => {
             gesture_begin (percentage, time);
diff --git a/src/Gestures/PanBackend.vala b/src/Gestures/PanBackend.vala
@@ -6,13 +6,16 @@
  */
 
 public class Gala.PanBackend : Object {
+    public delegate float GetTravelDistance ();
+
     public signal bool on_gesture_detected (Gesture gesture);
     public signal void on_begin (double delta, uint64 time);
     public signal void on_update (double delta, uint64 time);
     public signal void on_end (double delta, uint64 time);
 
     public Clutter.Actor actor { get; construct; }
-    public Utils.Size? travel_distances { get; construct; }
+
+    private GetTravelDistance get_travel_distance_func;
 
     private Clutter.PanAxis pan_axis;
     private Clutter.PanAction pan_action;
@@ -22,8 +25,12 @@ public class Gala.PanBackend : Object {
     private float origin_x;
     private float origin_y;
 
-    public PanBackend (Clutter.Actor actor, Utils.Size? travel_distances) {
-        Object (actor: actor, travel_distances: travel_distances);
+    private float travel_distance;
+
+    public PanBackend (Clutter.Actor actor, owned GetTravelDistance get_travel_distance_func) {
+        Object (actor: actor);
+
+        this.get_travel_distance_func = (owned) get_travel_distance_func;
     }
 
     construct {
@@ -36,6 +43,11 @@ public class Gala.PanBackend : Object {
         pan_action.gesture_begin.connect (on_gesture_begin);
         pan_action.pan.connect (on_pan);
         pan_action.gesture_end.connect (on_gesture_end);
+        pan_action.gesture_cancel.connect (on_gesture_end);
+    }
+
+    ~PanBackend () {
+        actor.remove_action (pan_action);
     }
 
     private bool on_gesture_begin () {
@@ -51,6 +63,8 @@ public class Gala.PanBackend : Object {
             return false;
         }
 
+        travel_distance = get_travel_distance_func ();
+
         on_begin (0, pan_action.get_last_event (0).get_time ());
 
         return true;
@@ -76,18 +90,16 @@ public class Gala.PanBackend : Object {
     }
 
     private double calculate_percentage (float current_x, float current_y) {
-        float current, origin, size;
+        float current, origin;
         if (pan_axis == X_AXIS) {
             current = direction == RIGHT ? float.max (current_x, origin_x) : float.min (current_x, origin_x);
             origin = origin_x;
-            size = travel_distances != null ? travel_distances.width : actor.width;
         } else {
             current = direction == DOWN ? float.max (current_y, origin_y) : float.min (current_y, origin_y);
             origin = origin_y;
-            size = travel_distances != null ? travel_distances.height : actor.height;
         }
 
-        return (current - origin).abs () / size;
+        return (current - origin).abs () / travel_distance;
     }
 
     private Gesture build_gesture () {
diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala
@@ -336,5 +336,14 @@ namespace Gala {
                 return { 0, 0, (int) screen_width, (int) screen_height };
             }
         }
+
+        public static float travel_distance_from_primary (Meta.Display display, Clutter.Orientation orientation) {
+            var geom = display.get_monitor_geometry (display.get_primary_monitor ());
+            if (orientation == HORIZONTAL) {
+                return geom.width;
+            } else {
+                return geom.height;
+            }
+        }
     }
 }
diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
@@ -53,6 +53,8 @@ namespace Gala {
             }
         }
 
+        private float workspaces_travel_distance;
+
         public MultitaskingView (WindowManager wm) {
             Object (wm: wm);
         }
@@ -70,10 +72,12 @@ namespace Gala {
 
             multitasking_gesture_tracker = new GestureTracker (ANIMATION_DURATION, ANIMATION_DURATION);
             multitasking_gesture_tracker.enable_touchpad ();
+            multitasking_gesture_tracker.enable_pan (display.get_stage (), () => InternalUtils.travel_distance_from_primary (wm.get_display (), VERTICAL));
             multitasking_gesture_tracker.on_gesture_detected.connect (on_multitasking_gesture_detected);
 
             workspace_gesture_tracker = new GestureTracker (AnimationDuration.WORKSPACE_SWITCH_MIN, AnimationDuration.WORKSPACE_SWITCH);
             workspace_gesture_tracker.enable_touchpad ();
+            workspace_gesture_tracker.enable_pan (this, () => workspaces_travel_distance);
             workspace_gesture_tracker.enable_scroll (this, Clutter.Orientation.HORIZONTAL);
             workspace_gesture_tracker.on_gesture_detected.connect (on_workspace_gesture_detected);
 
@@ -90,16 +94,17 @@ namespace Gala {
             blurred_bg.add_effect (new BlurEffect (blurred_bg, 18));
             blurred_bg.add_effect (brightness_effect);
 
-            add_child (blurred_bg);
-
             // Create a child container that will be sized to fit the primary monitor, to contain the "main"
             // multitasking view UI. The Clutter.Actor of this class has to be allowed to grow to the size of the
             // stage as it contains MonitorClones for each monitor.
-            primary_monitor_container = new Clutter.Actor ();
+            primary_monitor_container = new Clutter.Actor () {
+                reactive = true
+            };
+            primary_monitor_container.add_child (blurred_bg);
             primary_monitor_container.add_child (icon_groups);
             primary_monitor_container.add_child (workspaces);
+            primary_monitor_container.add_child (dock_clones);
             add_child (primary_monitor_container);
-            add_child (dock_clones);
 
             unowned var manager = display.get_workspace_manager ();
             manager.workspace_added.connect (add_workspace);
@@ -310,6 +315,7 @@ namespace Gala {
         }
 
         private bool on_workspace_gesture_detected (Gesture gesture) {
+            warning ("DETECTED");
             if (!opened) {
                 return false;
             }
@@ -323,6 +329,7 @@ namespace Gala {
             if (gesture.type == Clutter.EventType.SCROLL || (can_handle_swipe && fingers)) {
                 var direction = workspace_gesture_tracker.settings.get_natural_scroll_direction (gesture);
                 switch_workspace_with_gesture (direction);
+                warning ("GO");
                 return true;
             }
 
@@ -370,6 +377,8 @@ namespace Gala {
                 }
             }
 
+            workspaces_travel_distance = (initial_x - target_x).abs ();
+
             if (!is_nudge_animation && active_icon_group.get_transition ("backdrop-opacity") != null) {
                 active_icon_group.remove_transition ("backdrop-opacity");
             }
@@ -699,9 +708,6 @@ namespace Gala {
             }
 
             if (opening) {
-                modal_proxy = wm.push_modal (this);
-                modal_proxy.set_keybinding_filter (keybinding_filter);
-
                 wm.background_group.hide ();
                 wm.window_group.hide ();
                 wm.top_window_group.hide ();
@@ -771,6 +777,12 @@ namespace Gala {
                         dock_clones.destroy_all_children ();
 
                         wm.pop_modal (modal_proxy);
+
+                        multitasking_gesture_tracker.enable_pan (wm.get_display ().get_stage (), () => InternalUtils.travel_distance_from_primary (wm.get_display (), VERTICAL));
+                    } else {
+                        modal_proxy = wm.push_modal (this);
+                        modal_proxy.set_keybinding_filter (keybinding_filter);
+                        multitasking_gesture_tracker.enable_pan (primary_monitor_container, () => InternalUtils.travel_distance_from_primary (wm.get_display (), VERTICAL));
                     }
 
                     animating = false;
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -185,7 +185,7 @@ namespace Gala {
 
             stage = display.get_stage () as Clutter.Stage;
 
-            gesture_tracker.enable_pan (stage, new Utils.Size.primary_monitor_tracking (display));
+            gesture_tracker.enable_pan (stage, () => InternalUtils.travel_distance_from_primary (get_display (), HORIZONTAL));
 
             var background_settings = new GLib.Settings ("org.gnome.desktop.background");
             var color = background_settings.get_string ("primary-color");

Original file line number	Diff line number	Diff line change
`@@ -336,5 +336,14 @@ namespace Gala {`
`336`	`336`	`return { 0, 0, (int) screen_width, (int) screen_height };`
`337`	`337`	`}`
`338`	`338`	`}`
	`339`	`+`
	`340`	`+ public static float travel_distance_from_primary (Meta.Display display, Clutter.Orientation orientation) {`
	`341`	`+ var geom = display.get_monitor_geometry (display.get_primary_monitor ());`
	`342`	`+ if (orientation == HORIZONTAL) {`
	`343`	`+ return geom.width;`
	`344`	`+ } else {`
	`345`	`+ return geom.height;`
	`346`	`+ }`
	`347`	`+ }`
`339`	`348`	`}`
`340`	`349`	`}`