Merge branch 'develop' into release

paperwm · May 10, 2024 · 3f30622 · 3f30622
2 parents 4deb4f7 + b93f0a5
commit 3f30622
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 3 deletions.
diff --git a/keybindings.js b/keybindings.js
@@ -193,6 +193,18 @@ export function setupActions(settings) {
     registerNavigatorAction("switch-down-or-else-workspace", Tiling.switchDownOrElseWorkspace);
 
     registerMinimapAction("switch-first", Tiling.activateFirstWindow);
+
+    registerMinimapAction("switch-second", (mw, space) => Tiling.activateNthWindow(1, space));
+    registerMinimapAction("switch-third", (mw, space) => Tiling.activateNthWindow(2, space));
+    registerMinimapAction("switch-fourth", (mw, space) => Tiling.activateNthWindow(3, space));
+    registerMinimapAction("switch-fifth", (mw, space) => Tiling.activateNthWindow(4, space));
+    registerMinimapAction("switch-sixth", (mw, space) => Tiling.activateNthWindow(5, space));
+    registerMinimapAction("switch-seventh", (mw, space) => Tiling.activateNthWindow(6, space));
+    registerMinimapAction("switch-eighth", (mw, space) => Tiling.activateNthWindow(7, space));
+    registerMinimapAction("switch-ninth", (mw, space) => Tiling.activateNthWindow(8, space));
+    registerMinimapAction("switch-tenth", (mw, space) => Tiling.activateNthWindow(9, space));
+    registerMinimapAction("switch-eleventh", (mw, space) => Tiling.activateNthWindow(10, space));
+
     registerMinimapAction("switch-last", Tiling.activateLastWindow);
 
     registerMinimapAction("switch-global-right", (mw, space) => space.switchGlobalRight());

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.8.1",
+  "version-name": "46.9.0",
   "donations": {
     "buymeacoffee": "jaytaala",
     "patreon": "valpackett"

diff --git a/prefsKeybinding.js b/prefsKeybinding.js
@@ -40,6 +40,16 @@ const actions = {
         'switch-up-or-else-workspace',
         'switch-down-or-else-workspace',
         'switch-first',
+        'switch-second',
+        'switch-third',
+        'switch-fourth',
+        'switch-fifth',
+        'switch-sixth',
+        'switch-seventh',
+        'switch-eighth',
+        'switch-ninth',
+        'switch-tenth',
+        'switch-eleventh',
         'switch-last',
         'live-alt-tab',
         'live-alt-tab-backward',

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
@@ -251,6 +251,48 @@
         <default><![CDATA[['<Super>Home']]]></default>
         <summary>Switch to the first window</summary>
     </key>
+
+    <key type="as" name="switch-second">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the second window</summary>
+    </key>
+    <key type="as" name="switch-third">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the third window</summary>
+    </key>
+    <key type="as" name="switch-fourth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the fourth window</summary>
+    </key>
+    <key type="as" name="switch-fifth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the fifth window</summary>
+    </key>
+    <key type="as" name="switch-sixth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the sixth window</summary>
+    </key>
+    <key type="as" name="switch-seventh">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the seventh window</summary>
+    </key>
+    <key type="as" name="switch-eighth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the eighth window</summary>
+    </key>
+    <key type="as" name="switch-ninth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the ninth window</summary>
+    </key>
+    <key type="as" name="switch-tenth">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the tenth window</summary>
+    </key>
+    <key type="as" name="switch-eleventh">
+        <default><![CDATA[[]]]></default>
+        <summary>Switch to the eleventh window</summary>
+    </key>
+
     <key type="as" name="switch-last">
         <default><![CDATA[['<Super>End']]]></default>
         <summary>Switch to the last window</summary>

diff --git a/tiling.js b/tiling.js
@@ -4635,12 +4635,12 @@ export function activateNthWindow(n, space) {
     ensureViewport(nth, space);
 }
 
-export function activateFirstWindow(mw, space) {
+export function activateFirstWindow(_mw, space) {
     space = space || spaces.activeSpace;
     activateNthWindow(0, space);
 }
 
-export function activateLastWindow(mw, space) {
+export function activateLastWindow(_mw, space) {
     space = space || spaces.activeSpace;
     activateNthWindow(space.length - 1, space);
 }