Fix:gui_internal:Guard against accidental scrolling when user is likely going to...
authormdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sat, 25 Feb 2012 22:42:19 +0000 (22:42 +0000)
committermdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sat, 25 Feb 2012 22:42:19 +0000 (22:42 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4947 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/gui/internal/gui_internal.c

index e7c639c..7c1f562 100644 (file)
@@ -1135,6 +1135,12 @@ static void gui_internal_motion_cb(struct gui_priv *this)
        if (this->pressed && this->highlighted) {
                struct widget *menu, *wt=NULL;
                struct widget *wr=NULL;
+               int dx,dy;
+               
+               /* Guard against accidental scrolling when user is likely going to swipe */
+               gui_internal_gesture_get_vector(this, 1000, NULL, &dx, &dy);
+               if(abs(dx)>abs(dy) || abs(dy)<this->icon_s)
+                       return;
        
                if(this->highlighted)
                        for(wr=this->highlighted;wr && wr->type!=widget_table_row;wr=wr->parent);