summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Carlson <marcus@mejlamej.nu>2010-07-05 23:32:29 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2010-07-06 01:39:10 +0200
commit1f6f65c9547b430eb1414758a50d2aeea142869e (patch)
treeceaa335c12fedb5db6de322378e67754256c8efd
parente23140e8aea753ebb4195f1cfe728c62367fbdeb (diff)
downloadnautilus-1f6f65c9547b430eb1414758a50d2aeea142869e.tar.gz
Don't eat Alt+Right/Left in icon container
So they do not interfere with history browsing https://bugzilla.gnome.org/show_bug.cgi?id=411664
-rw-r--r--libnautilus-private/nautilus-icon-container.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 061ba88fe..4ce95a49e 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -5396,8 +5396,11 @@ key_press_event (GtkWidget *widget,
break;
case GDK_Left:
case GDK_KP_Left:
- keyboard_left (container, event);
- handled = TRUE;
+ /* Don't eat Alt-Left, as that is used for history browsing */
+ if ((event->state & GDK_MOD1_MASK) == 0) {
+ keyboard_left (container, event);
+ handled = TRUE;
+ }
break;
case GDK_Up:
case GDK_KP_Up:
@@ -5409,8 +5412,11 @@ key_press_event (GtkWidget *widget,
break;
case GDK_Right:
case GDK_KP_Right:
- keyboard_right (container, event);
- handled = TRUE;
+ /* Don't eat Alt-Right, as that is used for history browsing */
+ if ((event->state & GDK_MOD1_MASK) == 0) {
+ keyboard_right (container, event);
+ handled = TRUE;
+ }
break;
case GDK_Down:
case GDK_KP_Down: