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

Removed screwy GtkScrolledWindow logic

Browse Source 
Removed portion of scrolled-window that observes user-set
size request data (aux_info->width/height) on the child directly
in order to derive it's minimum possible size... if the scrolled
window has (auto/always) scrollbars in a said orientation; only
request enough space for the scrollbars (bug 631976).
This commit is contained in:
Tristan Van Berkom 2010-10-15 14:14:14 +09:00
parent 479dc131ee
commit d7c7f010b0
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gtk/gtkscrolledwindow.c
View File

@ -2010,19 +2010,9 @@ gtk_scrolled_window_get_preferred_size (GtkWidget *widget,
} }
else else
{ {
GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (child, FALSE); /* Always ask for at least enough to fit the scrollbars */
minimum_req.width += vscrollbar_requisition.width;
if (aux_info && aux_info->width > 0) natural_req.width += vscrollbar_requisition.width;
{
minimum_req.width += aux_info->width;
natural_req.width += aux_info->width;
extra_width = -1;
}
else
{
minimum_req.width += vscrollbar_requisition.width;
natural_req.width += vscrollbar_requisition.width;
}
} }
} }
else /* GTK_ORIENTATION_VERTICAL */ else /* GTK_ORIENTATION_VERTICAL */
@ -2038,19 +2028,9 @@ gtk_scrolled_window_get_preferred_size (GtkWidget *widget,
} }
else else
{ {
GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (child, FALSE); /* Always ask for at least enough to fit the scrollbars */
minimum_req.height += hscrollbar_requisition.height;
if (aux_info && aux_info->height > 0) natural_req.height += hscrollbar_requisition.height;
{
minimum_req.height += aux_info->height;
natural_req.height += aux_info->height;
extra_height = -1;
}
else
{
minimum_req.height += hscrollbar_requisition.height;
natural_req.height += hscrollbar_requisition.height;
}
} }
} }
} }
@ -2073,10 +2053,10 @@ gtk_scrolled_window_get_preferred_size (GtkWidget *widget,
extra_width = scrollbar_spacing + vscrollbar_requisition.width; extra_width = scrollbar_spacing + vscrollbar_requisition.width;
} }
minimum_req.width += MAX (0, extra_width); minimum_req.width += extra_width;
minimum_req.height += MAX (0, extra_height); minimum_req.height += extra_height;
natural_req.width += MAX (0, extra_width); natural_req.width += extra_width;
natural_req.height += MAX (0, extra_height); natural_req.height += extra_height;
if (priv->shadow_type != GTK_SHADOW_NONE) if (priv->shadow_type != GTK_SHADOW_NONE)
{ {