diff options
Diffstat (limited to 'gtk/gtkspinbutton.c')
| -rw-r--r-- | gtk/gtkspinbutton.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 8e65d8a272..878e8c2354 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1335,6 +1335,10 @@ gtk_spin_button_scroll (GtkWidget *widget, GtkSpinButton *spin = GTK_SPIN_BUTTON (widget); GtkSpinButtonPrivate *priv = spin->priv; + /* Scrolling the parent window/container takes precedence - Issue #3092 */ + if (gtk_widget_inside_scrollable_container (widget)) + return GDK_EVENT_PROPAGATE; + if (event->direction == GDK_SCROLL_UP) { if (!gtk_widget_has_focus (widget)) @@ -1348,9 +1352,9 @@ gtk_spin_button_scroll (GtkWidget *widget, gtk_spin_button_real_spin (spin, -gtk_adjustment_get_step_increment (priv->adjustment)); } else - return FALSE; + return GDK_EVENT_PROPAGATE; - return TRUE; + return GDK_EVENT_STOP; } static gboolean |