Merge branch 'fix-keybind-clash-above_tab-grave-equivalence' into dev…

…elop
paperwm · May 23, 2023 · 0592c92 · 0592c92
2 parents 3b2b717 + 9e18eb8
commit 0592c92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -432,8 +432,6 @@ There's a few Gnome Shell settings which works poorly with PaperWM. Namely
   spanning all monitors
 - `edge-tiling`: We don't support the native half tiled windows
 - `attach-modal-dialogs`: Attached modal dialogs can cause visual glitching
-- `toggle-tiled-left`: Default GNOME keyboard shortcut `super+left` collides with a default PaperWM shortcut. We disable the GNOME shortcut
-- `toggle-tiled-right`: Default GNOME keyboard shortcut `super+right` collides with a default PaperWM shortcut. We disable the GNOME shortcut
 
 To use the recommended settings run
 [`set-recommended-gnome-shell-settings.sh`](https://github.com/paperwm/PaperWM/blob/master/set-recommended-gnome-shell-settings.sh). A "restore previous settings" script is generated so the original settings is not lost.

diff --git a/settings.js b/settings.js
@@ -237,9 +237,9 @@ function printWorkspaceSettings() {
 function keystrToKeycombo(keystr) {
     // Above_Tab is a fake keysymbol provided by mutter
     let aboveTab = false;
-    if (keystr.match(/Above_Tab/)) {
+    if (keystr.match(/Above_Tab/) || keystr.match(/grave/)) {
         // Gtk bails out if provided with an unknown keysymbol
-        keystr = keystr.replace('Above_Tab', 'A');
+        keystr = keystr.replace('Above_Tab', 'a');
         aboveTab = true;
     }
     let [ok, key, mask] = Gtk.accelerator_parse(keystr);