AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "ScrolledWindow—Don’t req size for auto-hidden bars"

Browse Source 
This reverts commit 367e021652.

This causes criticals in e.g. the Text View: Multiple Buffers demo.
More work is required to get a fix for Bug 778853 that does not cause
anything else to regress.

https://bugzilla.gnome.org/show_bug.cgi?id=778853
This commit is contained in:
Daniel Boles 2017-02-22 19:13:49 +00:00
parent 4e61aaa0a4
commit 555847d44f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkscrolledwindow.c
View File

@ -1886,7 +1886,7 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
* Now add to the requisition any additional space for surrounding scrollbars
* and the special scrollable border.
*/
if (priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
if (policy_may_be_visible (priv->hscrollbar_policy))
{
minimum_req.width = MAX (minimum_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
natural_req.width = MAX (natural_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
@ -1898,7 +1898,7 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
}
}
if (priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
if (policy_may_be_visible (priv->vscrollbar_policy))
{
minimum_req.height = MAX (minimum_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
natural_req.height = MAX (natural_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);