summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2008-08-02 19:16:46 +0000
committerChristian Neumair <cneumair@src.gnome.org>2008-08-02 19:16:46 +0000
commit86990ff07b0b28afa22d76b318d701fde2bc3767 (patch)
treecbc6086f2ff41ca16fc02b27fee5d0287a14dd84
parenta47db58fab391f96a1187d9e1cfc7b6d46e1d48b (diff)
downloadnautilus-86990ff07b0b28afa22d76b318d701fde2bc3767.tar.gz
Never use linear selection in manual layout.
2008-08-02 Christian Neumair <cneumair@gnome.org> * libnautilus-private/nautilus-icon-container.c (keyboard_move_to): Never use linear selection in manual layout. svn path=/trunk/; revision=14436
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-icon-container.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c02e29cbd..a83bf46db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-08-02 Christian Neumair <cneumair@gnome.org>
+ * libnautilus-private/nautilus-icon-container.c (keyboard_move_to):
+ Never use linear selection in manual layout.
+
+2008-08-02 Christian Neumair <cneumair@gnome.org>
+
* libnautilus-private/nautilus-icon-container.c (get_cmp_point_x),
(same_column_below_highest), (keyboard_move_to),
(keyboard_arrow_key), (is_rectangle_selection_event),
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 6b2e818af..88cdbf49c 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3123,7 +3123,8 @@ keyboard_move_to (NautilusIconContainer *container,
set_keyboard_focus (container, icon);
container->details->keyboard_rubberband_start = NULL;
} else if (event != NULL &&
- (event->state & GDK_CONTROL_MASK) != 0 &&
+ ((event->state & GDK_CONTROL_MASK) != 0 ||
+ !container->details->auto_layout) &&
(event->state & GDK_SHIFT_MASK) != 0) {
/* Do rubberband selection */
EelDRect rect;