summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@gnome.org>2017-12-08 16:59:08 +0200
committerErnestas Kulik <ernestask@gnome.org>2018-03-24 20:06:52 +0200
commiteccbbff4cc8ec0dabade01b06fbe6ab98e63bce6 (patch)
tree9ea97a0765c98d1cae42448953de66a1159707f1
parent86dea5505dc5f1b447dc7a46a32b5e87fa763c9b (diff)
downloadnautilus-eccbbff4cc8ec0dabade01b06fbe6ab98e63bce6.tar.gz
rename-file-popover: fix key event state checking
Currently, when checking if the user pressed ctrl-z, an equality check is used on the state to determine whether the ctrl key is pressed. That does not work, however, as there may be other modifier masks applied, be it internal GDK values or mapping of num lock to mod2. That is fixed by using binary AND on the state with the relevant mask. Closes #149.
-rw-r--r--src/nautilus-rename-file-popover-controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-rename-file-popover-controller.c b/src/nautilus-rename-file-popover-controller.c
index 09d5d7980..83a13d6d9 100644
--- a/src/nautilus-rename-file-popover-controller.c
+++ b/src/nautilus-rename-file-popover-controller.c
@@ -195,7 +195,7 @@ name_entry_on_key_pressed (GtkWidget *widget,
return name_entry_on_f2_pressed (widget, self);
}
else if (key_event->keyval == GDK_KEY_z &&
- key_event->state == GDK_CONTROL_MASK)
+ (key_event->state & GDK_CONTROL_MASK) != 0)
{
return name_entry_on_undo (widget, self);
}