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

Changed initial values for requisition from -1 to 0.

Browse Source 
When doing size-requests and get_natural_size() calls, use 0 as
the base value instead of -1, because size_request code assumes
that widget->requesition is initialized at 0.
This commit is contained in:
Tristan Van Berkom 2010-04-04 16:38:36 -04:00
parent 75b8f7d3ae
commit 4b1315cedc
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtksizegroup.c
View File

@ -670,9 +670,9 @@ do_size_request (GtkWidget *widget)
* Note here that there is no convention of filling the argument or widget->requisition,
* so we have no choice but to fire size request with this pointer.
*/
g_signal_emit_by_name (widget,
"size-request",
&widget->requisition);
widget->requisition.width = 0;
widget->requisition.height = 0;
g_signal_emit_by_name (widget, "size-request", &widget->requisition);
/* Now get the extended layout minimum and natural size
*/

10
gtk/gtkwidget.c
View File

@ -10724,16 +10724,10 @@ gtk_widget_real_get_desired_size (GtkExtendedLayout *layout,
* on the "size-request" collected values (see gtksizegroup.c:do_size_request()).
*/
if (minimum_size)
{
minimum_size->width = -1;
minimum_size->height = -1;
}
memset (minimum_size, 0x0, sizeof (GtkRequisition));
if (natural_size)
{
natural_size->width = -1;
natural_size->height = -1;
}
memset (natural_size, 0x0, sizeof (GtkRequisition));
}
static void