From e62ca17f88c9af9d67ead3f0611e0dd9df8c8e88 Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Wed, 25 Jan 2023 22:26:07 +0100 Subject: [PATCH] scrolledWindow: Propagate event for no scrolling --- gtk/gtkscrolledwindow.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 90f0222ee6..4e497c1178 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1222,6 +1222,10 @@ captured_scroll_cb (GtkEventControllerScroll *scroll, gtk_scrolled_window_cancel_deceleration (scrolled_window); + if (!may_hscroll (scrolled_window) && + !may_vscroll (scrolled_window)) + return GDK_EVENT_PROPAGATE; + if (priv->smooth_scroll) { scrolled_window_scroll (scrolled_window, delta_x, delta_y, scroll); @@ -1412,6 +1416,10 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); + if (!may_hscroll (scrolled_window) && + !may_vscroll (scrolled_window)) + return GDK_EVENT_PROPAGATE; + if (!priv->smooth_scroll) scrolled_window_scroll (scrolled_window, delta_x, delta_y, scroll);