Merge branch 'main' into leolost/ws-manager-codestyle

Author: lenemter

data/gala.metainfo.xml.in

@@ -27,7 +27,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-      <release version="8.0.5" date="2024-12-18" urgency="medium">
+      <release version="8.1.0" date="2025-01-11" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>

meson.build

@@ -1,6 +1,6 @@
 project('gala',
     'c', 'vala',
-    version: '8.0.4',
+    version: '8.1.0',
     meson_version: '>= 0.59.0',
     license: 'GPL3',
 )

src/WindowManager.vala

@@ -2145,7 +2145,14 @@ namespace Gala {
                 unowned Meta.Display display = get_display ();
                 unowned var active_workspace = display.get_workspace_manager ().get_active_workspace ();
                 unowned var neighbor = active_workspace.get_neighbor (cancel_direction);
-                neighbor.activate (display.get_current_time ());
+
+                if (moving != null) {
+                    move_window (moving, neighbor, Meta.CURRENT_TIME);
+                } else {
+                    neighbor.activate (display.get_current_time ());
+                }
+            } else {
+                moving = null;
             }
         }
 
@@ -2207,7 +2214,6 @@ namespace Gala {
 
             windows = null;
             parents = null;
-            moving = null;
 
             out_group = null;
             in_group = null;