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/gtkscalebutton.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/gtkscalebutton.c')
| -rw-r--r-- | gtk/gtkscalebutton.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 04d90a783a..9c0dd43c2e 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -150,7 +150,7 @@ static void cb_scale_value_changed (GtkRange *range, static void cb_popup_mapped (GtkWidget *popup, gpointer user_data); -static void gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, +static gboolean gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, gdouble dx, gdouble dy, GtkScaleButton *button); @@ -766,7 +766,7 @@ gtk_scale_button_set_orientation_private (GtkScaleButton *button, } } -static void +static gboolean gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, gdouble dx, gdouble dy, @@ -784,6 +784,8 @@ gtk_scale_button_scroll_controller_scroll (GtkEventControllerScroll *scroll, gtk_adjustment_get_upper (adjustment)); gtk_scale_button_set_value (button, d); + + return TRUE; } /* |