diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-08-26 10:57:37 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-08-26 10:57:37 -0400 |
| commit | 00a83be564cd4a62692228109e6b92e23a9c8761 (patch) | |
| tree | 51fcb8b2ed45569190ae1ba963417fd02c67da27 | |
| parent | dd1e0aaf05d776bd71d37f759a103ce870f2d338 (diff) | |
| download | gtk+-00a83be564cd4a62692228109e6b92e23a9c8761.tar.gz | |
place sidebar: Use GdkEvent API
| -rw-r--r-- | gtk/gtkplacessidebar.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 7c5557b71e..d15d6164b6 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -1533,6 +1533,7 @@ on_motion_notify_event (GtkWidget *widget, { GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data); guint state; + double x_root, y_root; if (sidebar->drag_row == NULL || sidebar->dragging_over) return FALSE; @@ -1541,9 +1542,11 @@ on_motion_notify_event (GtkWidget *widget, !(state & GDK_BUTTON1_MASK)) return FALSE; + gdk_event_get_root_coords ((GdkEvent *) event, &x_root, &y_root); + if (gtk_drag_check_threshold (widget, sidebar->drag_root_x, sidebar->drag_root_y, - event->x_root, event->y_root)) + x_root, y_root)) { sidebar->dragging_over = TRUE; @@ -3480,6 +3483,7 @@ on_button_press_event (GtkWidget *widget, GtkPlacesSidebar *sidebar; GtkPlacesSidebarSectionType section_type; gdouble x, y; + double x_root, y_root; g_object_get (GTK_SIDEBAR_ROW (row), "sidebar", &sidebar, @@ -3489,12 +3493,13 @@ on_button_press_event (GtkWidget *widget, if (section_type == SECTION_BOOKMARKS) { gdk_event_get_coords ((GdkEvent *) event, &x, &y); + gdk_event_get_root_coords ((GdkEvent *) event, &x_root, &y_root); sidebar->drag_row = GTK_WIDGET (row); sidebar->drag_row_x = (gint)x; sidebar->drag_row_y = (gint)y; - sidebar->drag_root_x = event->x_root; - sidebar->drag_root_y = event->y_root; + sidebar->drag_root_x = x_root; + sidebar->drag_root_y = y_root; } g_object_unref (sidebar); |