From a61779ae0780a9dc0d364e6b544a4a89cd29e2c1 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 12 Nov 2018 12:51:58 +0100 Subject: files-view: Adapt to changes in GtkEventControllerScroll The ::scroll handler now returns a boolean value to indicate whether the event was handled. --- src/nautilus-files-view.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 7be255da0..6cbd3de1e 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -8977,7 +8977,7 @@ nautilus_files_view_set_property (GObject *object, } } -static void +static gboolean on_event_controller_scroll_scroll (GtkEventControllerScroll *controller, double dx, double dy, @@ -8990,12 +8990,12 @@ on_event_controller_scroll_scroll (GtkEventControllerScroll *controller, if (!gtk_get_current_event_state (&state)) { - return; + return GDK_EVENT_PROPAGATE; } if (!(state & GDK_CONTROL_MASK)) { - return; + return GDK_EVENT_PROPAGATE; } if (dy < 0) @@ -9008,6 +9008,8 @@ on_event_controller_scroll_scroll (GtkEventControllerScroll *controller, /* Zoom Out */ nautilus_files_view_bump_zoom_level (directory_view, -1); } + + return GDK_EVENT_STOP; } static void -- cgit v1.2.1