From 36599a09cead791900935aeadcea49d46ff6a786 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 10 Nov 2011 18:58:47 +0000 Subject: Clicks become drags only after 2px svn path=/trunk/netsurf/; revision=13145 --- amiga/tree.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/amiga/tree.c b/amiga/tree.c index 1ace82d13..60bf21aaa 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -871,23 +871,25 @@ BOOL ami_tree_event(struct treeview_window *twin) if(twin->mouse_state & BROWSER_MOUSE_PRESS_1) { - tree_mouse_action(twin->tree, - BROWSER_MOUSE_DRAG_1 | twin->key_state, x, y); - twin->mouse_state = BROWSER_MOUSE_HOLDING_1 | - BROWSER_MOUSE_DRAG_ON; - if(twin->drag_x == 0) twin->drag_x = x; - if(twin->drag_y == 0) twin->drag_y = y; - ami_tree_drag_icon_show(twin); + if((abs(x - twin->drag_x) + abs(y - twin->drag_y)) > 2) + { + tree_mouse_action(twin->tree, + BROWSER_MOUSE_DRAG_1 | twin->key_state, x, y); + twin->mouse_state = BROWSER_MOUSE_HOLDING_1 | + BROWSER_MOUSE_DRAG_ON; + ami_tree_drag_icon_show(twin); + } } else if(twin->mouse_state & BROWSER_MOUSE_PRESS_2) { - tree_mouse_action(twin->tree, - BROWSER_MOUSE_DRAG_2 | twin->key_state, x, y); - twin->mouse_state = BROWSER_MOUSE_HOLDING_2 | - BROWSER_MOUSE_DRAG_ON; - if(twin->drag_x == 0) twin->drag_x = x; - if(twin->drag_y == 0) twin->drag_y = y; - ami_tree_drag_icon_show(twin); + if((abs(x - twin->drag_x) + abs(y - twin->drag_y)) > 2) + { + tree_mouse_action(twin->tree, + BROWSER_MOUSE_DRAG_2 | twin->key_state, x, y); + twin->mouse_state = BROWSER_MOUSE_HOLDING_2 | + BROWSER_MOUSE_DRAG_ON; + ami_tree_drag_icon_show(twin); + } } } twin->lastclick.tv_sec = 0; @@ -910,9 +912,13 @@ BOOL ami_tree_event(struct treeview_window *twin) { case SELECTDOWN: twin->mouse_state = BROWSER_MOUSE_PRESS_1; + if(twin->drag_x == 0) twin->drag_x = x; + if(twin->drag_y == 0) twin->drag_y = y; break; case MIDDLEDOWN: twin->mouse_state = BROWSER_MOUSE_PRESS_2; + if(twin->drag_x == 0) twin->drag_x = x; + if(twin->drag_y == 0) twin->drag_y = y; break; } } -- cgit v1.2.3