From a6fd058a015e4b95fd2f12c1c6a2ecadde65f6d8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Tue, 22 Jan 2008 18:43:39 +0000 Subject: [PATCH] Do not create the idle function for kinetic scrolling if we are not in a 2008-01-22 Carlos Garcia Campos * shell/ev-view.c: (ev_view_button_release_event): Do not create the idle function for kinetic scrolling if we are not in a drag operation. svn path=/trunk/; revision=2840 --- ChangeLog | 7 +++++++ shell/ev-view.c | 18 +++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66aba098..4038a865 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-22 Carlos Garcia Campos + + * shell/ev-view.c: (ev_view_button_release_event): + + Do not create the idle function for kinetic scrolling if we are + not in a drag operation. + 2008-01-22 Carlos Garcia Campos * shell/ev-view.c: (ev_view_handle_cursor_over_xy), diff --git a/shell/ev-view.c b/shell/ev-view.c index 28a21393..28635067 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -3132,7 +3132,6 @@ ev_view_button_release_event (GtkWidget *widget, EvView *view = EV_VIEW (widget); EvLink *link = NULL; - view->drag_info.in_drag = FALSE; view->image_dnd_info.in_drag = FALSE; if (view->scroll_info.autoscrolling) { @@ -3146,17 +3145,22 @@ ev_view_button_release_event (GtkWidget *widget, return TRUE; } - - view->drag_info.release_timeout_id = g_timeout_add (20, - (GSourceFunc)ev_view_scroll_drag_release, view); - if (view->pressed_button == 2) { - ev_view_handle_cursor_over_xy (view, event->x, event->y); + if (view->drag_info.in_drag) { + view->drag_info.release_timeout_id = + g_timeout_add (20, + (GSourceFunc)ev_view_scroll_drag_release, view); } - if (view->document && view->pressed_button != 3) { + if (view->document && !view->drag_info.in_drag && view->pressed_button != 3) { link = ev_view_get_link_at_location (view, event->x, event->y); } + + view->drag_info.in_drag = FALSE; + + if (view->pressed_button == 2) { + ev_view_handle_cursor_over_xy (view, event->x, event->y); + } view->pressed_button = -1; -- 2.43.5