summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ekulik@redhat.com>2018-11-12 12:51:58 +0100
committerErnestas Kulik <ekulik@redhat.com>2019-06-29 14:33:41 +0200
commita61779ae0780a9dc0d364e6b544a4a89cd29e2c1 (patch)
tree6841bdb8218f6f754cfb2853f0baf95824d08e22
parent04648f4c1b4536002800a6ae9c72b42d514b6b5d (diff)
downloadnautilus-a61779ae0780a9dc0d364e6b544a4a89cd29e2c1.tar.gz
files-view: Adapt to changes in GtkEventControllerScroll
The ::scroll handler now returns a boolean value to indicate whether the event was handled.
-rw-r--r--src/nautilus-files-view.c8
1 files 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