Skip to content

Fix Super key detection and shortcut validation #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuresm57 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Super key detection and shortcut validation #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions shortcuts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,22 @@ export let ShortcutSettingWidget = class extends Gtk.Button {
_onKeyPressed(_widget, keyval, keycode, state) {
let mask = state & Gtk.accelerator_get_default_mod_mask();
mask &= ~Gdk.ModifierType.LOCK_MASK;

if (state & Gdk.ModifierType.MOD4_MASK) {
mask |= Gdk.ModifierType.MOD4_MASK;
}

if (!mask && keyval === Gdk.KEY_Escape) {
this._editor.close();
return Gdk.EVENT_STOP;
}

if (keyval === Gdk.KEY_BackSpace) {
this.saveShortcut(); // Clear shortcut
this.saveShortcut();
return Gdk.EVENT_STOP;
}

if (!mask) {
return Gdk.EVENT_STOP;
}

Expand Down Expand Up @@ -142,7 +150,7 @@ export let ShortcutSettingWidget = class extends Gtk.Button {

isValidBinding(mask, keycode, keyval) {
return !(
mask === 0 ||
false ||
(mask === Gdk.SHIFT_MASK &&
keycode !== 0 &&
((keyval >= Gdk.KEY_a && keyval <= Gdk.KEY_z) ||
Expand All @@ -160,12 +168,14 @@ export let ShortcutSettingWidget = class extends Gtk.Button {
(keyval >= Gdk.KEY_Thai_kokai && keyval <= Gdk.KEY_Thai_lekkao) ||
(keyval >= Gdk.KEY_Hangul_Kiyeog &&
keyval <= Gdk.KEY_Hangul_J_YeorinHieuh) ||
(keyval === Gdk.KEY_space && mask === 0) ||
this.keyvalIsForbidden(keyval)))
);
}

isValidAccel(mask, keyval) {
if (keyval === Gdk.KEY_space && mask !== 0) {
return true;
}
return (
Gtk.accelerator_valid(keyval, mask) ||
(keyval === Gdk.KEY_Tab && mask !== 0)
Expand Down