Merge branch 'develop' into release

paperwm · May 8, 2024 · e52d026 · e52d026
2 parents 87880d4 + c2b1c1d
commit e52d026
Show file tree

Hide file tree

Showing 7 changed files with 462 additions and 65 deletions.
diff --git a/Settings.ui b/Settings.ui
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.7.0",
+  "version-name": "46.8.0",
   "donations": {
     "buymeacoffee": "jaytaala",
     "patreon": "valpackett"

diff --git a/prefs.js b/prefs.js
@@ -234,11 +234,18 @@ class SettingsWidget {
 
         doubleValueChanged('animation_time_spin', 'animation-time');
         percentValueChanged('minimap_scale_spin', 'minimap-scale');
-        percentValueChanged('edge_scale_spin', 'edge-preview-scale');
         percentValueChanged('window_switcher_preview_scale_spin', 'window-switcher-preview-scale');
         percentValueChanged('overview_max_window_scale_spin', 'overview-max-window-scale');
         intValueChanged('minimap_shade_opacity_spin', 'minimap-shade-opacity');
 
+        // tiling edge preview settings
+        booleanStateChanged('edge-preview-enable');
+        percentValueChanged('edge_scale_spin', 'edge-preview-scale');
+        booleanStateChanged('edge-preview-click-enable');
+        booleanStateChanged('edge-preview-timeout-enable');
+        intValueChanged('edge_preview_timeout_scale', 'edge-preview-timeout');
+        booleanStateChanged('edge-preview-timeout-continual');
+
         const openWindowPosition = this.builder.get_object('open-window-position');
         const owpos = this._settings.get_int('open-window-position');
         switch (owpos) {

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
@@ -240,7 +240,7 @@
     </key>
     <key type="as" name="switch-up-or-else-workspace">
         <default><![CDATA[[]]]></default>
-        <summary>Switch window or workspace above</summary>
+        <summary>Switch to window or workspace above</summary>
     </key>
     <key type="as" name="switch-down-or-else-workspace">
         <default><![CDATA[[]]]></default>
@@ -445,11 +445,36 @@
       <summary>Sets the opacity of the non-selected windows during minimap navigation.</summary>
     </key>
 
+    <key type="b" name="edge-preview-enable">
+      <default>true</default>
+      <summary>Enables tiling edge window previews</summary>
+    </key>
+
     <key type="d" name="edge-preview-scale">
       <default>0.15</default>
       <summary>Scale of window previews at tiling edge. Scale is percent of actual window size.</summary>
     </key>
 
+    <key type="b" name="edge-preview-click-enable">
+      <default>true</default>
+      <summary>Enables activating edge preview with click</summary>
+    </key>
+
+    <key type="b" name="edge-preview-timeout-enable">
+      <default>false</default>
+      <summary>Enables activating edge preview with a timeout</summary>
+    </key>
+
+    <key type="i" name="edge-preview-timeout">
+      <default>800</default>
+      <summary>Timeout (ms) before activating the edge preview</summary>
+    </key>
+
+    <key type="b" name="edge-preview-timeout-continual">
+      <default>false</default>
+      <summary>Enables the continual activation of windows if pointer is at edge of monitor</summary>
+    </key>
+
     <key type="d" name="window-switcher-preview-scale">
       <default>0.15</default>
       <summary>Scale of window switch previewse.  Scale is percent of actual window size</summary>

diff --git a/settings.js b/settings.js
@@ -32,18 +32,47 @@ export function enable(extension) {
     _overriddingConflicts = false;
     prefs = {};
     [
-        'window-gap', 'vertical-margin', 'vertical-margin-bottom', 'horizontal-margin',
-        'workspace-colors', 'default-background', 'animation-time', 'default-show-top-bar',
-        'swipe-sensitivity', 'swipe-friction', 'cycle-width-steps', 'cycle-height-steps',
-        'maximize-width-percent', 'minimap-scale', 'edge-preview-scale',
-        'window-switcher-preview-scale', 'winprops', 'show-workspace-indicator',
-        'show-window-position-bar', 'show-focus-mode-icon', 'show-open-position-icon',
-        'disable-topbar-styling', 'default-focus-mode', 'gesture-enabled',
-        'gesture-horizontal-fingers', 'gesture-workspace-fingers', 'open-window-position',
-        'overview-ensure-viewport-animation', 'overview-min-windows-per-row',
-        'overview-max-window-scale', 'minimap-shade-opacity', 'selection-border-size',
-        'open-window-position-option-right', 'open-window-position-option-left',
-        'open-window-position-option-start', 'open-window-position-option-end',
+        'window-gap',
+        'vertical-margin',
+        'vertical-margin-bottom',
+        'horizontal-margin',
+        'workspace-colors',
+        'default-background',
+        'animation-time',
+        'default-show-top-bar',
+        'swipe-sensitivity',
+        'swipe-friction',
+        'cycle-width-steps',
+        'cycle-height-steps',
+        'maximize-width-percent',
+        'minimap-scale',
+        'edge-preview-enable',
+        'edge-preview-scale',
+        'edge-preview-click-enable',
+        'edge-preview-timeout-enable',
+        'edge-preview-timeout',
+        'edge-preview-timeout-continual',
+        'window-switcher-preview-scale',
+        'winprops',
+        'show-workspace-indicator',
+        'show-window-position-bar',
+        'show-focus-mode-icon',
+        'show-open-position-icon',
+        'disable-topbar-styling',
+        'default-focus-mode',
+        'gesture-enabled',
+        'gesture-horizontal-fingers',
+        'gesture-workspace-fingers',
+        'open-window-position',
+        'overview-ensure-viewport-animation',
+        'overview-min-windows-per-row',
+        'overview-max-window-scale',
+        'minimap-shade-opacity',
+        'selection-border-size',
+        'open-window-position-option-right',
+        'open-window-position-option-left',
+        'open-window-position-option-start',
+        'open-window-position-option-end',
     ]
         .forEach(k => setState(null, k));
     prefs.__defineGetter__("minimum_margin", () => {