Revert "Dynamic workspace behaviour: add behaviour option that works …

…better with #950"
paperwm · Oct 13, 2024 · 2677f33 · 2677f33
1 parent b8ccbab
commit 2677f33
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 75 deletions.
diff --git a/Settings.ui b/Settings.ui
@@ -370,47 +370,6 @@
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
-                        <property name="focusable">False</property>
-                        <child>
-                          <object class="GtkGrid">
-                            <property name="focusable">False</property>
-                            <property name="tooltip_text" translatable="yes">Sets dynamic workspace behavior.  PaperWM mode only removes empty spaces at the end of the workspace stack.</property>
-                            <property name="margin_start">12</property>
-                            <property name="margin_end">12</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="column_spacing">32</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="focusable">False</property>
-                                <property name="hexpand">1</property>
-                                <property name="label" translatable="yes">Dynamic workspaces behavior</property>
-                                <property name="use_markup">1</property>
-                                <property name="xalign">0</property>
-                                <layout>
-                                  <property name="column">0</property>
-                                  <property name="row">0</property>
-                                </layout>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="dynamic-workspace-behavior">
-                                <property name="focusable">False</property>
-                                <property name="hexpand">0</property>
-                                <property name="width-request">106</property>
-                                <items>
-                                  <item id="gnome" translatable="yes">Gnome</item>
-                                  <item id="paperwm" translatable="yes">PaperWM</item>
-                                </items>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>

diff --git a/patches.js b/patches.js
@@ -678,20 +678,11 @@ export function _checkWorkspaces() {
 
     // Delete empty workspaces except for the last one; do it from the end
     // to avoid index changes
-    // PaperWM dynamic workspace behaviour
-    const removeCheck = i => {
-        switch (Settings.prefs.dynamic_workspace_behavior) {
-        case 0:
-            // eslint-disable-next-line eqeqeq
-            return emptyWorkspaces[i] && i != lastEmptyIndex;
-        default:
-            return emptyWorkspaces[i] && i > lastEmptyIndex;
-        }
-    };
     for (i = lastIndex; i >= 0; i--) {
         // eslint-disable-next-line eqeqeq
-        if (removeCheck(i)) {
-            workspaceManager.remove_workspace(this._workspaces[i], global.get_current_time());
+        if (emptyWorkspaces[i] && i != lastEmptyIndex) {
+            workspaceManager.remove_workspace(this._workspaces[i]
+                , global.get_current_time());
         }
     }
 

diff --git a/prefs.js b/prefs.js
@@ -330,15 +330,6 @@ class SettingsWidget {
             this._settings.set_boolean('show-workspace-indicator', !state);
         });
 
-        enumOptionsChanged(
-            'dynamic-workspace-behavior',
-            {
-                'gnome': 0,
-                'paperwm': 1,
-            },
-            'paperwm',
-            1);
-
         // Workspaces
         booleanStateChanged('use-default-background');
 

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
@@ -748,11 +748,6 @@
         <summary>Sets the animation when exiting GNOME overview and ensuring selected window is in view. 0:NONE, 1:TRANSLATE, 2:FADE</summary>
     </key>
 
-    <key type="i" name="dynamic-workspace-behavior">
-        <default>1</default>
-        <summary>Sets the behaviour for dynamic workspaces (paperwm mode only removes empty spaces at the end). 0:GNOME, 1:PAPERWM</summary>
-    </key>
-
     <key type="as" name="winprops">
         <default><![CDATA[[]]]></default>
         <summary>Array of winprops as (JSON) string objects</summary>

diff --git a/settings.js b/settings.js
@@ -81,7 +81,6 @@ export function enable(extension) {
         'open-window-position-option-end',
         'open-window-position-option-down',
         'open-window-position-option-up',
-        'dynamic-workspace-behavior',
     ]
         .forEach(k => setState(null, k));
     prefs.__defineGetter__("minimum_margin", () => {

diff --git a/tiling.js b/tiling.js
@@ -4084,13 +4084,6 @@ export function insertWindow(metaWindow, options = {}) {
     const space = spaces.spaceOfWindow(metaWindow);
 
     if (overwriteSpace !== undefined) {
-        // create required spaces
-        let created = 0;
-        while (workspaceManager.nWorkspaces <= overwriteSpace) {
-            workspaceManager.append_new_workspace(false, global.get_current_time());
-            created++;
-        }
-        console.debug("#winprops", `created ${created} new spaces for insertion`);
         const newspace = spaces.spaceOfIndex(overwriteSpace);
         if (!newspace) {
             console.warn("#winprops", `overwriteSpace with index ${overwriteSpace} does not exist. \