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

scrolledwindow: Avoid using gtk_widget_get_preferred_size

Browse Source 
This way we only measure in the direction we need.
This commit is contained in:
Timm Bäder 2019-12-22 10:42:51 +01:00
parent b8d1c3ab55
commit 412fcb0330
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtkscrolledwindow.c
View File

@ -1728,35 +1728,50 @@ gtk_scrolled_window_measure (GtkWidget *widget,
*/ */
if (policy_may_be_visible (priv->hscrollbar_policy)) if (policy_may_be_visible (priv->hscrollbar_policy))
{ {
GtkRequisition hscrollbar_requisition;
gtk_widget_get_preferred_size (priv->hscrollbar, &hscrollbar_requisition, NULL);
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
minimum_req = MAX (minimum_req, hscrollbar_requisition.width + sborder.left + sborder.right); int min_scrollbar_width, nat_scrollbar_width;
natural_req = MAX (natural_req, hscrollbar_requisition.width + sborder.left + sborder.right);
gtk_widget_measure (priv->hscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
&min_scrollbar_width, &nat_scrollbar_width,
NULL, NULL);
minimum_req = MAX (minimum_req, min_scrollbar_width + sborder.left + sborder.right);
natural_req = MAX (natural_req, nat_scrollbar_width + sborder.left + sborder.right);
} }
else if (!priv->use_indicators && priv->hscrollbar_policy == GTK_POLICY_ALWAYS) else if (!priv->use_indicators && priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
{ {
minimum_req += hscrollbar_requisition.height; int min_scrollbar_height, nat_scrollbar_height;
natural_req += hscrollbar_requisition.height;
gtk_widget_measure (priv->hscrollbar, GTK_ORIENTATION_VERTICAL, -1,
&min_scrollbar_height, &nat_scrollbar_height,
NULL, NULL);
minimum_req += min_scrollbar_height;
natural_req += nat_scrollbar_height;
} }
} }
if (policy_may_be_visible (priv->vscrollbar_policy)) if (policy_may_be_visible (priv->vscrollbar_policy))
{ {
GtkRequisition vscrollbar_requisition;
gtk_widget_get_preferred_size (priv->vscrollbar, &vscrollbar_requisition, NULL);
if (orientation == GTK_ORIENTATION_VERTICAL) if (orientation == GTK_ORIENTATION_VERTICAL)
{ {
minimum_req = MAX (minimum_req, vscrollbar_requisition.height + sborder.top + sborder.bottom); int min_scrollbar_height, nat_scrollbar_height;
natural_req = MAX (natural_req, vscrollbar_requisition.height + sborder.top + sborder.bottom);
gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_VERTICAL, -1,
&min_scrollbar_height, &nat_scrollbar_height,
NULL, NULL);
minimum_req = MAX (minimum_req, min_scrollbar_height + sborder.top + sborder.bottom);
natural_req = MAX (natural_req, nat_scrollbar_height + sborder.top + sborder.bottom);
} }
else if (!priv->use_indicators && priv->vscrollbar_policy == GTK_POLICY_ALWAYS) else if (!priv->use_indicators && priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
{ {
minimum_req += vscrollbar_requisition.width; int min_scrollbar_width, nat_scrollbar_width;
natural_req += vscrollbar_requisition.width;
gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
&min_scrollbar_width, &nat_scrollbar_width,
NULL, NULL);
minimum_req += min_scrollbar_width;
natural_req += nat_scrollbar_width;
} }
} }