Merge branch 'main' into leolost/move-to-old-ws

Author: lenemter

data/gala.metainfo.xml.in

@@ -44,6 +44,7 @@
         <issue url="https://github.com/elementary/gala/issues/2088">Invisible window clones</issue>
         <issue url="https://github.com/elementary/gala/issues/2113">gnome-session-x11-services-ready.target isn't started on Wayland session</issue>
         <issue url="https://github.com/elementary/gala/issues/2131">Unthemed cursor style and glitchy menus on some applications</issue>
+        <issue url="https://github.com/elementary/gala/issues/2154">Windows do not display correctly after moving between workspaces</issue>
         <issue url="https://github.com/elementary/gala/issues/2159">Crash when moving windows between workspaces and using gestures to switch</issue>
         <issue url="https://github.com/elementary/gala/issues/2169">Text UI based Scaling: Tiny Titlebars in XWayland Apps</issue>
         <issue url="https://github.com/elementary/gala/issues/2171">PiP dragging doesn't start until after mouse is released</issue>

src/Gestures/GesturePropertyTransition.vala

@@ -84,7 +84,10 @@ public class Gala.GesturePropertyTransition : Object {
      * to the final position. If with_gesture is false it will just ease to the {@link to_value}.
      * #this will keep itself alive until the animation finishes so it is safe to immediatly unref it after creation and calling start.
      *
-     * @param done_callback a callback for when the transition finishes. It is guaranteed to be called exactly once.
+     * @param done_callback a callback for when the transition finishes. This shouldn't be used for setting state, instead state should
+     * be set immediately on {@link GestureTracker.OnEnd} not only once the animation ends to allow for interrupting the animation by starting a new gesture.
+     * done_callback will only be called if the animation finishes, not if it is interrupted e.g. by starting a new animation for the same property,
+     * destroying the actor or removing the transition.
      */
     public void start (bool with_gesture, owned DoneCallback? done_callback = null) {
         ref ();
@@ -179,8 +182,8 @@ public class Gala.GesturePropertyTransition : Object {
         }
     }
 
-    private void finish () {
-        if (done_callback != null) {
+    private void finish (bool callback = true) {
+        if (done_callback != null && callback) {
             done_callback ();
         }
 

src/ScreenshotManager.vala

@@ -155,7 +155,7 @@ namespace Gala {
             var rect = window.get_frame_rect ();
 #if HAS_MUTTER45
             if (!include_frame) {
-#if else
+#else
             if ((include_frame && window.is_client_decorated ()) ||
                 (!include_frame && !window.is_client_decorated ())) {
 #endif

src/Widgets/WindowClone.vala

@@ -266,6 +266,10 @@ public class Gala.WindowClone : Clutter.Actor {
             update_hover_widgets (false);
             toggle_shadow (false);
         });
+
+        if (should_fade ()) {
+            new GesturePropertyTransition (this, gesture_tracker, "opacity", null, 0u).start (with_gesture);
+        }
     }
 
     /**
@@ -294,6 +298,7 @@ public class Gala.WindowClone : Clutter.Actor {
         new GesturePropertyTransition (this, gesture_tracker, "y", intial_y, (float) rect.y).start (with_gesture);
         new GesturePropertyTransition (this, gesture_tracker, "width", (float) initial_width, (float) rect.width).start (with_gesture);
         new GesturePropertyTransition (this, gesture_tracker, "height", (float) initial_height, (float) rect.height).start (with_gesture);
+        new GesturePropertyTransition (this, gesture_tracker, "opacity", null, 255u).start (with_gesture);
         new GesturePropertyTransition (this, gesture_tracker, "shadow-opacity", (uint8) 0, (uint8) 255).start (with_gesture);
         new GesturePropertyTransition (window_icon, gesture_tracker, "opacity", 0u, 255u).start (with_gesture, () => {
             update_hover_widgets (false);

src/WindowManager.vala

@@ -1922,29 +1922,7 @@ namespace Gala {
             }
             main_container.add_child (static_windows);
 
-            // if we have a move action, pack that window to the static ones
-            if (moving != null) {
-                unowned var moving_actor = (Meta.WindowActor) moving.get_compositor_private ();
-
-                windows.prepend (moving_actor);
-                parents.prepend (moving_actor.get_parent ());
-
-                moving_actor.set_translation (-clone_offset_x, -clone_offset_y, 0);
-                clutter_actor_reparent (moving_actor, static_windows);
-            }
-
             unowned var grabbed_window = window_grab_tracker.current_window;
-
-            if (grabbed_window != null) {
-                unowned var moving_actor = (Meta.WindowActor) grabbed_window.get_compositor_private ();
-
-                windows.prepend (moving_actor);
-                parents.prepend (moving_actor.get_parent ());
-
-                moving_actor.set_translation (-clone_offset_x, -clone_offset_y, 0);
-                clutter_actor_reparent (moving_actor, static_windows);
-            }
-
             var to_has_fullscreened = false;
             var from_has_fullscreened = false;
 
@@ -1960,15 +1938,11 @@ namespace Gala {
                     continue;
                 }
 
-                if (!window.showing_on_its_workspace () ||
-                    move_primary_only && !window.is_on_primary_monitor () ||
-                    window == moving ||
-                    window == grabbed_window) {
-
+                if (!window.showing_on_its_workspace () || move_primary_only && !window.is_on_primary_monitor ()) {
                     continue;
                 }
 
-                if (window.on_all_workspaces) {
+                if (window.on_all_workspaces || window == moving || window == grabbed_window) {
                     // notifications use their own group and are always on top
                     if (NotificationStack.is_notification (window)) {
                         continue;
@@ -1980,8 +1954,8 @@ namespace Gala {
                     clutter_actor_reparent (actor, static_windows);
                     actor.set_translation (-clone_offset_x, -clone_offset_y, 0);
 
-                    // Don't fade docks they just stay where they are
-                    if (window.window_type == DOCK) {
+                    // Don't fade docks and moving/grabbed windows they just stay where they are
+                    if (window.window_type == DOCK || window == moving || window == grabbed_window) {
                         continue;
                     }