diff options
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index ef4996c027..57fbbd6e0c 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2707,8 +2707,12 @@ gtk_combo_box_scroll_event (GtkWidget *widget, GtkTreeIter iter; GtkTreeIter new_iter; + /* Scrolling the parent window/container takes precedence - Issue #3092 */ + if (gtk_widget_inside_scrollable_container (widget)) + return GDK_EVENT_PROPAGATE; + if (!gtk_combo_box_get_active_iter (combo_box, &iter)) - return TRUE; + return GDK_EVENT_STOP; if (event->direction == GDK_SCROLL_UP) found = tree_prev (combo_box, priv->model, @@ -2720,7 +2724,7 @@ gtk_combo_box_scroll_event (GtkWidget *widget, if (found) gtk_combo_box_set_active_iter (combo_box, &new_iter); - return TRUE; + return GDK_EVENT_STOP; } /* |