[gtk+/wip/garnacho/touchpad-gestures: 1/14] scrolledwindow: Keep scrollbars out of GtkScrollable::get_border

[Carlos Garnacho <carlosg src gnome org>]

commit acd777e46f4476696b284cbc4c55a5bebfeff216
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jul 1 22:24:03 2015 +0200

    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

 gtk/gtkscrolledwindow.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 81676d6..a56844f 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);