summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-icon-container.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2003-03-18 12:09:52 +0000
committerAlexander Larsson <alexl@src.gnome.org>2003-03-18 12:09:52 +0000
commitfdea078b1e9523eb5a8cc9b5c4729fa82d46f715 (patch)
tree11f89d860e08ef5e09333e2e138adbed6fb72d07 /libnautilus-private/nautilus-icon-container.c
parent5305f2c666f7a93d7671517ccb9b045dd76f73c5 (diff)
downloadnautilus-fdea078b1e9523eb5a8cc9b5c4729fa82d46f715.tar.gz
Don't activate on double click of any modifiers are used.
2003-03-18 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-icon-container.c (handle_icon_button_press): Don't activate on double click of any modifiers are used.
Diffstat (limited to 'libnautilus-private/nautilus-icon-container.c')
-rw-r--r--libnautilus-private/nautilus-icon-container.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index f4d46dd53..272f92413 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3723,11 +3723,12 @@ handle_icon_button_press (NautilusIconContainer *container,
}
if (event->type == GDK_2BUTTON_PRESS &&
event->button == DRAG_BUTTON) {
- if (icon == details->double_click_icon[1]) {
- /* Double clicking does not trigger a D&D action. */
- details->drag_button = 0;
- details->drag_icon = NULL;
-
+ /* Double clicking does not trigger a D&D action. */
+ details->drag_button = 0;
+ details->drag_icon = NULL;
+
+ if (icon == details->double_click_icon[1] &&
+ !button_event_modifies_selection (event)) {
activate_selected_items (container);
}
return TRUE;