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

widget: Always warn when underallocating widgets

Browse Source
This commit is contained in:
Timm Bäder 2016-02-23 10:34:16 +01:00
parent 4c698bc824
commit 84dfda1a2b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkwidget.c
View File

@ -6035,8 +6035,6 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
} }
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
if (GTK_DEBUG_CHECK (GEOMETRY))
{
if ((min_width > real_allocation.width || min_height > real_allocation.height) && if ((min_width > real_allocation.width || min_height > real_allocation.height) &&
!GTK_IS_SCROLLABLE (widget)) !GTK_IS_SCROLLABLE (widget))
g_warning ("gtk_widget_size_allocate(): attempt to underallocate %s%s %s %p. " g_warning ("gtk_widget_size_allocate(): attempt to underallocate %s%s %s %p. "
@ -6045,7 +6043,6 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
G_OBJECT_TYPE_NAME (widget), widget, G_OBJECT_TYPE_NAME (widget), widget,
real_allocation.width, real_allocation.height, real_allocation.width, real_allocation.height,
min_width, min_height); min_width, min_height);
}
#endif #endif
/* Now that we have the right natural height and width, go ahead and remove any margins from the /* Now that we have the right natural height and width, go ahead and remove any margins from the
* allocated sizes and possibly limit them to the natural sizes */ * allocated sizes and possibly limit them to the natural sizes */