From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 1 Jul 2015 20:24:03 +0000 (+0200)
Subject: scrolledwindow: Keep scrollbars out of GtkScrollable::get_border
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9126
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dec95caf942dba64110b910ffbfc4ce9d3058561;p=gtk4.git

scrolledwindow: Keep scrollbars out of GtkScrollable::get_border

It looks a bit odd that scrollbars stay over treeview headers and
similar, seems nicer to just avoid the border regions.

https://bugzilla.gnome.org/show_bug.cgi?id=751805
---

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 81676d6ae9..a56844f542 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2687,7 +2687,7 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
 
   priv = scrolled_window->priv;
 
-  gtk_scrolled_window_relative_allocation (widget, &content_allocation);
+  gtk_scrolled_window_inner_allocation (widget, &content_allocation);
   sb_spacing = _gtk_scrolled_window_get_scrollbar_spacing (scrolled_window);
   gtk_widget_get_preferred_height (priv->hscrollbar, &sb_height, NULL);
   gtk_widget_get_preferred_width (priv->vscrollbar, &sb_width, NULL);