AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 19:30:10 +00:00
Code Issues Projects Releases Wiki Activity

layoutmanager: Never pass NULL pointers to ->measure

Browse Source 
We don't do that in GtkWidgetClass::measure() implementations either, so
make the semantics match.
This commit is contained in:
Timm Bäder 2019-05-25 08:59:20 +02:00
parent 23ddac2e72
commit 4134b67827
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtklayoutmanager.c
View File

@ -264,6 +264,11 @@ gtk_layout_manager_measure (GtkLayoutManager *manager,
int *natural_baseline) int *natural_baseline)
{ {
GtkLayoutManagerClass *klass; GtkLayoutManagerClass *klass;
int min_size = 0;
int nat_size = 0;
int min_baseline = -1;
int nat_baseline = -1;
g_return_if_fail (GTK_IS_LAYOUT_MANAGER (manager)); g_return_if_fail (GTK_IS_LAYOUT_MANAGER (manager));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
@ -272,8 +277,20 @@ gtk_layout_manager_measure (GtkLayoutManager *manager,
klass->measure (manager, widget, orientation, klass->measure (manager, widget, orientation,
for_size, for_size,
minimum, natural, &min_size, &nat_size,
minimum_baseline, natural_baseline); &min_baseline, &nat_baseline);
if (minimum)
*minimum = min_size;
if (natural)
*natural = nat_size;
if (minimum_baseline)
*minimum_baseline = min_baseline;
if (natural_baseline)
*natural_baseline = nat_baseline;
} }
/** /**