Merge pull request #392 from Leleat/cherry-pick-from-354

Some minor ports of commits from #354

ambient.d.ts

@@ -0,0 +1,36 @@
+import "@girs/gjs";
+import "@girs/gjs/dom";
+import "@girs/gnome-shell/ambient";
+import "@girs/gnome-shell/extensions/global";
+
+/***********************
+ * Module Augmentation *
+ ***********************/
+
+import "tiling-assistant@leleat-on-github/src/dependencies/gi.js";
+import { Rect } from "tiling-assistant@leleat-on-github/src/extension/utility.js";
+
+declare module "tiling-assistant@leleat-on-github/src/dependencies/gi.js" {
+    namespace Clutter {
+        interface Actor {
+            ease: (params: object) => void;
+        }
+    }
+
+    namespace GObject {
+        interface Object {
+            connectObject: (...args: unknown[]) => void;
+            disconnectObject: (object: object) => void;
+        }
+    }
+
+    namespace Meta {
+        interface Window {
+            assertExistence: () => void;
+            isTiled: boolean
+            tiledRect?: Rect
+            untiledRect?: Rect
+        }
+    }
+
+}

jsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "target": "ESNext",
+    "baseUrl": "."
+  },
+  "exclude": ["node_modules"]
+}

package.json

@@ -11,6 +11,8 @@
     "type": "module",
     "devDependencies": {
         "@eslint/js": "^9.0.0",
+        "@girs/gjs": "^4.0.0-beta.19",
+        "@girs/gnome-shell": "^47.0.1",
         "eslint": "^9.0.0"
     }
 }

tiling-assistant@leleat-on-github/prefs.js

@@ -3,8 +3,7 @@ import { ExtensionPreferences } from './src/dependencies/prefs.js';
 
 import LayoutPrefs from './src/prefs/layoutsPrefs.js';
 import { Shortcuts } from './src/common.js';
-// eslint-disable-next-line no-unused-vars
-import { ShortcutListener } from './src/prefs/shortcutListener.js';
+import './src/prefs/shortcutListener.js';
 
 export default class Prefs extends ExtensionPreferences {
     fillPreferencesWindow(window) {
@@ -145,7 +144,7 @@ export default class Prefs extends ExtensionPreferences {
                 settings.set_string(key, widget.get_rgba().to_string());
             });
 
-            // initilaize color
+            // initialize color
             const rgba = new Gdk.RGBA();
             rgba.parse(settings.get_string(key));
             widget.set_rgba(rgba);

tiling-assistant@leleat-on-github/src/common.js

@@ -18,7 +18,7 @@ export class Settings {
     }
 
     /**
-     * @returns {Gio.Settings} the Gio.Settings object.
+     * @returns {import("./dependencies/gi.js").Gio.Settings} the Gio.Settings object.
      */
     static getGioObject() {
         return this._settings;
@@ -279,7 +279,7 @@ export class Layout {
     }
 
     /**
-     * @returns {[boolean, string]} whether the layout has valid rects and
+     * @returns {[boolean, string, number]} whether the layout has valid rects and
      *      a potential error message.
      */
     validate() {

tiling-assistant@leleat-on-github/src/extension/focusHint.js

@@ -36,8 +36,7 @@ export default class FocusHintManager {
 
         this._settingsChangedId = Settings.changed(
             'focus-hint',
-            () => this._setHint(),
-            this
+            () => this._setHint()
         );
         this._setHint();
 
@@ -97,7 +96,9 @@ class Hint {
         this._removeIdleWatcher();
     }
 
-    indicate() {
+    /** @param {Meta.Window} focus */
+    // eslint-disable-next-line no-unused-vars
+    indicate(focus) {
         throw new Error('`indicate` not implemented by Hint subclass!');
     }
 
@@ -597,7 +598,7 @@ class StaticOutlineHint extends AnimatedOutlineHint {
     /**
      * This is really only used for the indication when changing workspaces...
      *
-     * @param {Window} window -
+     * @param {Meta.Window} window -
      * @param {number} workspaceSwitchAnimationDuration -
      */
     indicate(window, workspaceSwitchAnimationDuration = 250) {
@@ -764,8 +765,8 @@ function createContainers(
     let startingPos;
 
     if (workspaceAnimationWindowClone) {
-        const actorAbsPos = getAbsPos(window.get_compositor_private(), monitorNr);
-        const cloneAbsPos = getAbsPos(workspaceAnimationWindowClone, monitorNr);
+        const actorAbsPos = getAbsPos(window.get_compositor_private());
+        const cloneAbsPos = getAbsPos(workspaceAnimationWindowClone);
 
         startingPos = {
             x: monitorRect.x + cloneAbsPos.x - actorAbsPos.x,
@@ -827,8 +828,7 @@ function createContainers(
  * @returns {Clutter.Clone}
  */
 function createWindowClone(windowActor, container) {
-    const monitor = windowActor.get_meta_window().get_monitor();
-    const { x, y } = getAbsPos(windowActor, monitor);
+    const { x, y } = getAbsPos(windowActor);
 
     const windowClone = new Clutter.Clone({
         source: windowActor,

tiling-assistant@leleat-on-github/src/extension/moveHandler.js

@@ -141,7 +141,7 @@ export default class TilingMoveHandler {
 
                 counter += 10;
                 if (counter >= 400) {
-                    this._restoreSizeAndRestartGrab(window, x, y, grabOp);
+                    this._restoreSizeAndRestartGrab(window, grabOp);
                     this._restoreSizeTimerId = null;
                     return GLib.SOURCE_REMOVE;
                 }
@@ -151,7 +151,7 @@ export default class TilingMoveHandler {
                 const oldPoint = { x, y };
                 const moveDist = Util.getDistance(currPoint, oldPoint);
                 if (moveDist > 10) {
-                    this._restoreSizeAndRestartGrab(window, x, y, grabOp);
+                    this._restoreSizeAndRestartGrab(window, grabOp);
                     this._restoreSizeTimerId = null;
                     return GLib.SOURCE_REMOVE;
                 }
@@ -175,7 +175,7 @@ export default class TilingMoveHandler {
             // as often when compared to the position-changed signal.
             if (Settings.getBoolean('low-performance-move-mode')) {
                 this._movingTimerId = GLib.timeout_add(
-                    GLib.PRIORITY_IDLE,
+                    GLib.PRIORITY_DEFAULT_IDLE,
                     this._movingTimerDuration,
                     this._onMoving.bind(
                         this,
@@ -343,7 +343,7 @@ export default class TilingMoveHandler {
         const useIgnoreTa = defaultMode !== MoveModes.IGNORE_TA && pressed[ignoreTAMod] ||
             noMod && defaultMode === MoveModes.IGNORE_TA;
 
-        let newMode = '';
+        let newMode;
 
         if (useAdaptiveTiling)
             newMode = MoveModes.ADAPTIVE_TILING;
@@ -422,10 +422,9 @@ export default class TilingMoveHandler {
         }
     }
 
-    _restoreSizeAndRestartGrab(window, px, py, grabOp) {
+    _restoreSizeAndRestartGrab(window, grabOp) {
         Twm.untile(window, {
             restoreFullPos: false,
-            xAnchor: px,
             skipAnim: this._wasMaximizedOnStart
         });
 

tiling-assistant@leleat-on-github/src/extension/tileEditingMode.js

@@ -217,7 +217,7 @@ const Indicator = GObject.registerClass(class TileEditingModeIndicator extends S
         const workArea = new Rect(activeWs.get_work_area_for_monitor(this._monitor));
 
         // Adjusted for window / screen gaps
-        const { x, y, width, height } = rect.addGaps(workArea);
+        const { x, y, width, height } = rect.addGaps(workArea, this._monitor);
 
         this.ease({
             x: x - display.x,

tiling-assistant@leleat-on-github/src/extension/tilingPopup.js

@@ -21,7 +21,7 @@ export const TilingSwitcherPopup = GObject.registerClass({
     }
 }, class TilingSwitcherPopup extends AltTab.TilingAppSwitcherPopup {
     /**
-     * @param {Meta.Windows[]} openWindows an array of Meta.Windows, which this
+     * @param {Meta.Window[]} openWindows an array of Meta.Windows, which this
      *      popup offers to tile.
      * @param {Rect} freeScreenRect the Rect, which the popup will tile a window
      *      to. The popup will be centered in this rect.