Merge pull request #251 from Leleat/fix-misc

Fix misc
Leleat · Mar 26, 2023 · 31cee43 · 31cee43
2 parents 3a28e79 + 722df81
commit 31cee43
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/tiling-assistant@leleat-on-github/src/extension/moveHandler.js b/tiling-assistant@leleat-on-github/src/extension/moveHandler.js
@@ -450,7 +450,7 @@ var Handler = class TilingMoveHandler {
         // get_frame_rect() doesn't return the correct size immediately after
         // calling untile()... in that case just guess a random size
         if (!untiledRect && !Meta.is_wayland_compositor())
-            untiledRect = new Rect(rect);
+            untiledRect = new Rect(window.get_frame_rect());
 
         const untiledWidth = untiledRect?.width ?? 1000;
         const postUntileRect = window.get_frame_rect();

diff --git a/tiling-assistant@leleat-on-github/src/extension/tileEditingMode.js b/tiling-assistant@leleat-on-github/src/extension/tileEditingMode.js
@@ -81,7 +81,7 @@ class TileEditingMode extends St.Widget {
 
         // The windows may not be at the foreground. They just weren't
         // overlapping other windows. So raise the entire tile group.
-        this._windows.forEach(w => w.raise());
+        this._windows.forEach(w => w.raise_and_make_recent?.() ?? w.raise());
 
         // Create the active selection indicator.
         const window = this._windows[0];
@@ -333,7 +333,7 @@ const DefaultKeyHandler = class DefaultKeyHandler {
                 return Modes.CLOSE;
 
             // Re-raise tile group, so it isn't below the just-untiled window
-            this._windows[0].raise();
+            this._windows[0].raise_and_make_recent?.() ?? this._windows[0].raise();
             this._selectIndicator.focus(selectedRect, null);
 
         // [Enter] / [Esc]ape Tile Editing Mode

diff --git a/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js b/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js
@@ -152,7 +152,7 @@ var TilingWindowManager = class TilingWindowManager {
         window.unminimize();
         // Raise window since tiling with the popup means that
         // the window can be below others.
-        window.raise();
+        window.raise_and_make_recent?.() ?? window.raise();
 
         const oldRect = new Rect(window.get_frame_rect());
         const monitor = monitorNr ?? window.get_monitor();
@@ -260,7 +260,7 @@ var TilingWindowManager = class TilingWindowManager {
         // one. So untiling the initial window after tiling more windows with
         // the popup (without re-focusing the initial window), means the
         // untiled window will be below the others.
-        window.raise();
+        window.raise_and_make_recent?.() ?? window.raise();
 
         // Animation
         const untileAnim = Settings.getBoolean(Settings.ENABLE_UNTILE_ANIMATIONS);
@@ -437,7 +437,7 @@ var TilingWindowManager = class TilingWindowManager {
 
                         // Prevent an infinite loop of windows raising each other
                         w.block_signal_handler(otherRaiseId);
-                        w.raise();
+                        w.raise_and_make_recent?.() ?? w.raise();
                         w.unblock_signal_handler(otherRaiseId);
                     });
 
@@ -446,7 +446,7 @@ var TilingWindowManager = class TilingWindowManager {
                     // it may be below other tiled windows.
                     const signalId = this._signals.getSignalsFor(raisedWindowId).get(TilingSignals.RAISE);
                     raisedWindow.block_signal_handler(signalId);
-                    raisedWindow.raise();
+                    raisedWindow.raise_and_make_recent?.() ?? raisedWindow.raise();
                     raisedWindow.unblock_signal_handler(signalId);
                 }