Author: carlosgc
Date: Tue Jan 22 18:43:39 2008
New Revision: 2840
URL: http://svn.gnome.org/viewvc/evince?rev=2840&view=rev
Log:
2008-01-22 Carlos Garcia Campos <[EMAIL PROTECTED]>
* 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.
Modified:
trunk/ChangeLog
trunk/shell/ev-view.c
Modified: trunk/shell/ev-view.c
==============================================================================
--- trunk/shell/ev-view.c (original)
+++ trunk/shell/ev-view.c Tue Jan 22 18:43:39 2008
@@ -3132,7 +3132,6 @@
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 @@
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;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
