From d9e187083d44d991e5bb4fb458e1dbc22c2c3310 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Fri, 5 Sep 2008 16:52:36 +0000 Subject: [PATCH] Make sure the cursor is correctly restored after showing the right click 2008-09-05 Carlos Garcia Campos * shell/ev-view.c: (ev_view_motion_notify_event): Make sure the cursor is correctly restored after showing the right click menu. svn path=/trunk/; revision=3154 --- ChangeLog | 7 +++++++ shell/ev-view.c | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d8d1864..76004782 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-09-05 Carlos Garcia Campos + + * shell/ev-view.c: (ev_view_motion_notify_event): + + Make sure the cursor is correctly restored after showing the right + click menu. + 2008-09-05 Carlos Garcia Campos * libdocument/ev-attachment.[ch]: (ev_attachment_launch_app), diff --git a/shell/ev-view.c b/shell/ev-view.c index 750ee5e4..da895804 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -3038,15 +3038,20 @@ ev_view_motion_notify_event (GtkWidget *widget, } } - /* For the Evince 0.4.x release, we limit selection to un-rotated - * documents only. - */ - if (view->pressed_button == 1 && view->rotation == 0) { + switch (view->pressed_button) { + case 1: + /* For the Evince 0.4.x release, we limit selection to un-rotated + * documents only. + */ + if (view->rotation != 0) + return FALSE; /* Schedule timeout to scroll during selection and additionally * scroll once to allow arbitrary speed. */ if (!view->selection_scroll_id) - view->selection_scroll_id = g_timeout_add (SCROLL_TIME, (GSourceFunc)selection_scroll_timeout_cb, view); + view->selection_scroll_id = g_timeout_add (SCROLL_TIME, + (GSourceFunc)selection_scroll_timeout_cb, + view); else selection_scroll_timeout_cb (view); @@ -3063,7 +3068,7 @@ ev_view_motion_notify_event (GtkWidget *widget, view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view); return TRUE; - } else if (view->pressed_button == 2) { + case 2: if (!view->drag_info.in_drag) { gboolean start; int i; @@ -3113,10 +3118,11 @@ ev_view_motion_notify_event (GtkWidget *widget, return TRUE; } - } else if (view->pressed_button <= 0) { + + break; + default: ev_view_handle_cursor_over_xy (view, x, y); - return TRUE; - } + } return FALSE; } -- 2.43.5