graphics/eog
graphics/eog
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/eog synced 2024-10-18 14:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test for modifier keys correctly in EogWindow

Browse source 
See http://developer.gnome.org/gtk3/stable/checklist-modifiers.html for an explanation
of how this works.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>

https://bugzilla.gnome.org/show_bug.cgi?id=659830
This commit is contained in:
Federico Mena Quintero 2012-08-29 17:38:11 -05:00
parent bd4f71ebe5
commit 32cc946446
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/eog-window.c
View file

@ -4891,22 +4891,25 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
GtkContainer *tbcontainer = GTK_CONTAINER ((EOG_WINDOW (widget)->priv->toolbar));
gint result = FALSE;
gboolean handle_selection = FALSE;
GdkModifierType modifiers;
modifiers = gtk_accelerator_get_default_mod_mask ();
switch (event->keyval) {
case GDK_KEY_space:
if (event->state & GDK_CONTROL_MASK) {
if ((event->state & modifiers) == GDK_CONTROL_MASK) {
handle_selection = TRUE;
break;
}
case GDK_KEY_Return:
if (gtk_container_get_focus_child (tbcontainer) == NULL) {
/* Image properties dialog case */
if (event->state & GDK_MOD1_MASK) {
if ((event->state & modifiers) == GDK_MOD1_MASK) {
result = FALSE;
break;
}
if (event->state & GDK_SHIFT_MASK) {
if ((event->state & modifiers) == GDK_SHIFT_MASK) {
eog_window_cmd_go_prev (NULL, EOG_WINDOW (widget));
} else {
eog_window_cmd_go_next (NULL, EOG_WINDOW (widget));
@ -4936,7 +4939,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
}
break;
case GDK_KEY_Left:
if (event->state & GDK_MOD1_MASK) {
if ((event->state & modifiers) == GDK_MOD1_MASK) {
/* Alt+Left moves to previous image */
if (is_rtl) { /* move to next in RTL mode */
eog_window_cmd_go_next (NULL, EOG_WINDOW (widget));
@ -4967,7 +4970,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
break;
}
case GDK_KEY_Right:
if (event->state & GDK_MOD1_MASK) {
if ((event->state & modifiers) == GDK_MOD1_MASK) {
/* Alt+Right moves to next image */
if (is_rtl) { /* move to previous in RTL mode */
eog_window_cmd_go_prev (NULL, EOG_WINDOW (widget));