Merge branch 'main' into leolost/explicit-override-window-group

Author: zeebok

lib/Gestures/GestureController.vala

@@ -133,7 +133,7 @@ public class Gala.GestureController : Object {
             running = true;
         }
 
-        timeline = null;
+        remove_timeline ();
     }
 
     private bool gesture_detected (GestureBackend backend, Gesture gesture, uint32 timestamp) {
@@ -268,19 +268,36 @@ public class Gala.GestureController : Object {
         }
 
         var spring = new SpringTimeline (target.actor, progress, clamped_to, velocity, 1, 1, 500);
-        spring.progress.connect ((value) => progress = value);
-        spring.stopped.connect_after (finished);
+        spring.progress.connect (on_timeline_progress);
+        spring.stopped.connect_after (on_timeline_stopped);
 
         timeline = spring;
 
         target.propagate (COMMIT, action, clamped_to);
     }
 
-    private void finished (bool is_finished = true) requires (is_finished) {
+    private void on_timeline_progress (double value) {
+        progress = value;
+    }
+
+    private void on_timeline_stopped (bool is_finished) {
+        assert (is_finished);
+        finished ();
+    }
+
+    private void finished () {
         assert (running);
-        target.propagate (END, action, progress);
         running = false;
-        timeline = null;
+        remove_timeline ();
+        target.propagate (END, action, progress);
+    }
+
+    private void remove_timeline () {
+        if (timeline != null) {
+            timeline.progress.disconnect (on_timeline_progress);
+            timeline.stopped.disconnect (on_timeline_stopped);
+            timeline = null;
+        }
     }
 
     /**
@@ -302,6 +319,18 @@ public class Gala.GestureController : Object {
         finish ((to > progress ? 1 : -1) * 1, to);
     }
 
+    public void jump (double to) {
+        if (running && !recognizing) {
+            /* We are animating to a snap point so stop the animation */
+            finished ();
+        }
+
+        var clamped_to = to.clamp ((int) overshoot_lower_clamp, (int) overshoot_upper_clamp);
+
+        target?.propagate (COMMIT, action, clamped_to);
+        progress = clamped_to;
+    }
+
     public void cancel_gesture () {
         if (recognizing) {
             recognizing_backend.cancel_gesture ();

lib/Gestures/Triggers/SwipeTrigger.vala

@@ -11,11 +11,14 @@
  * It enables touchpad and (once supported) touchscreen backends for the given actor.
  */
 public class Gala.SwipeTrigger : Object, GestureTrigger {
-    public Clutter.Actor actor { get; construct; }
     public Clutter.Orientation orientation { get; construct; }
+    private weak Clutter.Actor actor;
 
     public SwipeTrigger (Clutter.Actor actor, Clutter.Orientation orientation) {
-        Object (actor: actor, orientation: orientation);
+        Object (orientation: orientation);
+
+        this.actor = actor;
+        actor.add_weak_pointer (&this.actor);
     }
 
     internal bool triggers (Gesture gesture) {
@@ -25,7 +28,7 @@ public class Gala.SwipeTrigger : Object, GestureTrigger {
         );
     }
 
-    internal void enable_backends (GestureController controller) {
+    internal void enable_backends (GestureController controller) requires (actor != null) {
         controller.enable_backend (new ScrollBackend (actor, orientation, new GestureSettings ()));
     }
 }

lib/Widgets/AbstractSwitcher.vala

@@ -31,7 +31,6 @@ public abstract class Gala.AbstractSwitcher : CanvasActor {
         style_manager = Drawing.StyleManager.get_instance ();
 
         container = new Clutter.Actor () {
-            reactive = true,
 #if HAS_MUTTER46
             layout_manager = new Clutter.FlowLayout (Clutter.Orientation.HORIZONTAL)
 #else
@@ -89,24 +88,35 @@ public abstract class Gala.AbstractSwitcher : CanvasActor {
         caption.margin_bottom = margin;
     }
 
-    protected override void get_preferred_width (float for_height, out float min_width, out float natural_width) {
-        min_width = 0;
-
-        float preferred_nat_width;
-        base.get_preferred_width (for_height, null, out preferred_nat_width);
-
+    public override void allocate (Clutter.ActorBox box) {
         unowned var display = wm.get_display ();
         var geom = display.get_monitor_geometry (display.get_current_monitor ());
 
-        float container_nat_width;
-        container.get_preferred_size (null, null, out container_nat_width, null);
+        float nat_container_width;
+        container.get_preferred_width (-1, null, out nat_container_width);
 
-        var max_width = float.min (
-            geom.width - Utils.scale_to_int (MIN_OFFSET * 2, monitor_scale), // Don't overflow the monitor
-            container_nat_width // Ellipsize the label if it's longer than the icons
-        );
+        var max_width = geom.width - Utils.scale_to_int (MIN_OFFSET * 2, monitor_scale);
+        var real_width = (int) float.min (nat_container_width, max_width);
+
+        float nat_container_height;
+        container.get_preferred_height (real_width, null, out nat_container_height);
+
+        float nat_caption_height;
+        caption.get_preferred_height (real_width, null, out nat_caption_height);
+
+        var horizontal_margin = (geom.width - real_width) / 2;
+
+        var children_height = nat_container_height + nat_caption_height;
+        var vertical_margin = (geom.height - children_height) / 2;
+
+        box = {
+            geom.x + horizontal_margin,
+            geom.y + vertical_margin,
+            geom.width - horizontal_margin,
+            geom.height - vertical_margin
+        };
 
-        natural_width = float.min (max_width, preferred_nat_width);
+        base.allocate (box);
     }
 
     protected override void draw (Cairo.Context ctx, int width, int height) {

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -92,6 +92,7 @@ public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
         add_child (StaticWindowContainer.get_instance (display));
 
         unowned var manager = display.get_workspace_manager ();
+        manager.workspace_added.connect (sync_active_workspace);
         manager.workspace_removed.connect (sync_active_workspace);
         manager.workspaces_reordered.connect (sync_active_workspace);
         manager.workspace_switched.connect (on_workspace_switched);
@@ -302,8 +303,12 @@ public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
     }
 
     private void sync_active_workspace () {
-        unowned var manager = display.get_workspace_manager ();
-        workspaces_gesture_controller.progress = -manager.get_active_workspace_index ();
+        if (workspaces_gesture_controller.recognizing) {
+            return;
+        }
+
+        var target = -display.get_workspace_manager ().get_active_workspace_index ();
+        workspaces_gesture_controller.jump (target);
     }
 
     private void on_workspace_switched (int from, int to) {

src/Widgets/WindowSwitcher/WindowSwitcher.vala

@@ -243,10 +243,6 @@ public class Gala.WindowSwitcher : AbstractSwitcher, GestureTarget, RootTarget {
             return;
         }
 
-        //Although we are setting visible via the opacity notify handler anyway
-        //we have to set it here manually otherwise the size gotten via get_preferred_size is wrong
-        visible = true;
-
         float width, height;
         get_preferred_size (null, null, out width, out height);
 

src/WindowManager.vala

@@ -1373,14 +1373,6 @@ namespace Gala {
                     yield builder.run ();
                     break;
 
-                case Meta.WindowType.MENU:
-                case Meta.WindowType.DROPDOWN_MENU:
-                case Meta.WindowType.POPUP_MENU:
-                    var builder = new TransitionBuilder (actor, AnimationDuration.MENU_MAP, EASE_OUT_QUAD);
-                    builder.add_property_with_from ("opacity", 0U, 255U);
-                    yield builder.run ();
-                    break;
-
                 case Meta.WindowType.MODAL_DIALOG:
                 case Meta.WindowType.DIALOG:
                     dim_parent_window (window);

tests/lib/GestureControllerTest.vala

@@ -164,6 +164,10 @@ public class Gala.GestureControllerTest : MutterTestCase {
         target.assert_and_remove_propagation (COMMIT, CUSTOM, 1);
         target.assert_and_remove_propagation (END, CUSTOM, 1);
         target.assert_no_propagations ();
+
+        assert_finalize_object (ref target);
+        assert_finalize_object (ref controller);
+        assert_finalize_object (ref backend);
     }
 
     /**

tests/lib/SwipeTriggerTest.vala

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2026 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Authored by: Leonhard Kargl <leo.kargl@proton.me>
+ */
+
+public class Gala.SwipeTriggerTest : MutterTestCase {
+    private Clutter.Actor? actor;
+    private SwipeTrigger? trigger;
+
+    public SwipeTriggerTest () {
+        Object (name: "SwipeTriggerTest");
+    }
+
+    construct {
+        add_test ("Test finalize trigger first", test_finalize_trigger_first);
+        add_test ("Test finalize actor first", test_finalize_actor_first);
+        add_test ("Test finalize actor and enable backend", test_finalize_actor_and_enable_backend);
+    }
+
+    public override void set_up () {
+        actor = new Clutter.Actor ();
+        trigger = new SwipeTrigger (actor, Clutter.Orientation.HORIZONTAL);
+    }
+
+    public override void tear_down () {
+        trigger = null;
+        actor = null;
+    }
+
+    private void test_finalize_trigger_first () {
+        assert_finalize_object (ref trigger);
+        assert_finalize_object (ref actor);
+    }
+
+    private void test_finalize_actor_first () {
+        // We can finalize the actor first because the swipe trigger only holds a weak reference to it
+        assert_finalize_object (ref actor);
+        assert_finalize_object (ref trigger);
+    }
+
+    private void test_finalize_actor_and_enable_backend () {
+        // We can finalize the actor first because the swipe trigger only holds a weak reference to it
+        assert_finalize_object (ref actor);
+
+        // Enabling the backend after the actor has been finalized should not cause a crash
+        // but print a warning
+        Test.expect_message (null, LEVEL_CRITICAL, "*assertion 'actor != null' failed");
+
+        var controller = new GestureController (CUSTOM);
+        trigger.enable_backends (controller);
+
+        Test.assert_expected_messages ();
+
+        assert_finalize_object (ref trigger);
+    }
+}
+
+public int main (string[] args) {
+    return new Gala.SwipeTriggerTest ().run (args);
+}

tests/lib/meson.build

@@ -2,6 +2,7 @@ tests = [
     'GestureControllerTest',
     'PropertyTargetTest',
     'SetupTest',
+    'SwipeTriggerTest',
 ]
 
 foreach test : tests