diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-18 16:34:39 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-07-18 16:36:18 +0300 |
| commit | 3ebd1c3fe77809a80ff1d647ba2d368b5aea0623 (patch) | |
| tree | b2ca961755b63110be132fca51cd8ecc53d27084 /gtk/gtkrange.c | |
| parent | 0750b4fd28eedf0782825e1b1f932b912c07c6c7 (diff) | |
| download | gtk+-scroll-event-propagation.tar.gz | |
eventcontrollerscroll: Conditionally propagate ::scrollscroll-event-propagation
Currently, gtk_event_controller_scroll_handle_event() always returns
TRUE if it is handled, which stops the propagation of the event. If
there’s a single GtkEventControllerScroll in the widget hierarchy, that
means that no others will run, depending on the propagation phase. In
Nautilus, this can be observed when adding a scroll controller to the
GtkScrolledWindow (ctrl-scrolling controls the zoom level) - either the
scrolling or the zooming breaks.
Fixes https://gitlab.gnome.org/GNOME/gtk/issues/45
Diffstat (limited to 'gtk/gtkrange.c')
| -rw-r--r-- | gtk/gtkrange.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 009293dd74..b848e623a2 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -236,7 +236,7 @@ static void gtk_range_allocate_trough (GtkGizmo *gi static gboolean gtk_range_render_trough (GtkGizmo *gizmo, GtkSnapshot *snapshot); -static void gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, +static gboolean gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, gdouble dx, gdouble dy, GtkRange *range); @@ -2228,7 +2228,7 @@ stop_scrolling (GtkRange *range) remove_autoscroll (range); } -static void +static gboolean gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, gdouble dx, gdouble dy, @@ -2262,6 +2262,8 @@ gtk_range_scroll_controller_scroll (GtkEventControllerScroll *scroll, g_signal_emit (range, signals[CHANGE_VALUE], 0, GTK_SCROLL_JUMP, gtk_adjustment_get_value (priv->adjustment) + delta, &handled); + + return TRUE; } static void |