Merge branch 'develop' into release

paperwm · Aug 6, 2024 · 797cf26 · 797cf26
2 parents fd31a03 + 2b25b20
commit 797cf26
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/metadata.json b/metadata.json
@@ -5,7 +5,7 @@
   "url": "https://github.com/paperwm/PaperWM",
   "settings-schema": "org.gnome.shell.extensions.paperwm",
   "shell-version": [ "45", "46" ],
-  "version-name": "46.15.0",
+  "version-name": "46.15.1",
   "donations": {
     "buymeacoffee": "jaytaala",
     "patreon": "valpackett"

diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
diff --git a/schemas/org.gnome.shell.extensions.paperwm.gschema.xml b/schemas/org.gnome.shell.extensions.paperwm.gschema.xml
@@ -227,11 +227,11 @@
     </key>
 
     <key type="as" name="drift-left">
-        <default><![CDATA[['<Ctrl><Shift>Left']]]></default>
+        <default><![CDATA[['<Super>bracketleft']]]></default>
         <summary>Drift tiling viewport to the left</summary>
     </key>
       <key type="as" name="drift-right">
-        <default><![CDATA[['<Ctrl><Shift>Right']]]></default>
+        <default><![CDATA[['<Super>bracketright']]]></default>
         <summary>Drift tiling viewport to the right</summary>
     </key>
 

diff --git a/scratch.js b/scratch.js
@@ -41,25 +41,22 @@ export function disable() {
    The actual window actor (not clone) is tweened to ensure it's on top of the
    other windows/clones (clones if the space animates)
  */
-export function easeScratch(metaWindow, targetX, targetY, tweenParams = {}) {
-    let f = metaWindow.get_frame_rect();
-    let b = metaWindow.get_buffer_rect();
-    let dx = f.x - b.x;
-    let dy = f.y - b.y;
-
-    Easer.addEase(metaWindow.get_compositor_private(), Object.assign(
-        {
-            time: Settings.prefs.animation_time,
-            x: targetX - dx,
-            y: targetY - dy,
+export function easeScratch(metaWindow, targetX, targetY, params = {}) {
+    const complete = params?.onComplete ?? function() {};
+    const f = metaWindow.get_frame_rect();
+    const b = metaWindow.get_buffer_rect();
+    const dx = f.x - b.x;
+    const dy = f.y - b.y;
+
+    Easer.addEase(metaWindow.get_compositor_private(), {
+        x: targetX - dx,
+        y: targetY - dy,
+        time: Settings.prefs.animation_time,
+        onComplete: () => {
+            metaWindow.move_frame(true, targetX, targetY);
+            complete();
         },
-        tweenParams,
-        {
-            onComplete (...args) {
-                metaWindow.move_frame(true, targetX, targetY);
-                tweenParams.onComplete && tweenParams.onComplete.apply(this, args);
-            },
-        }));
+    });
 }
 
 export function makeScratch(metaWindow) {

diff --git a/tiling.js b/tiling.js
@@ -4955,7 +4955,7 @@ export function centerWindowHorizontally(metaWindow) {
 
     const targetX = workArea.x + Math.round((workArea.width - frame.width) / 2);
     if (space.indexOf(metaWindow) === -1) {
-        metaWindow.move_frame(true, targetX + monitor.x, frame.y);
+        Scratch.easeScratch(metaWindow, targetX + monitor.x, frame.y);
     } else {
         move_to(space, metaWindow, {
             x: targetX,