From 359534ee59aa0572ca2bba2c509b93682ff5beeb Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 5 Aug 2015 11:14:39 +0200 Subject: [PATCH] GtkScrolledWindow: Don't handle key event when can't scroll Don't return that a key event was handled when the corresponding scrollbar can not scroll. https://bugzilla.gnome.org/show_bug.cgi?id=753256 --- gtk/gtkscrolledwindow.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index a56844f542..1c8536266d 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -2463,9 +2463,19 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window, } if (horizontal) - adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar)); + { + if (may_hscroll (scrolled_window)) + adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar)); + else + return FALSE; + } else - adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)); + { + if (may_vscroll (scrolled_window)) + adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)); + else + return FALSE; + } if (adjustment) {