mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-22 23:04:07 +00:00
layoutmanager: Never pass NULL pointers to ->measure
We don't do that in GtkWidgetClass::measure() implementations either, so make the semantics match.
This commit is contained in:
parent
23ddac2e72
commit
4134b67827
@ -264,6 +264,11 @@ gtk_layout_manager_measure (GtkLayoutManager *manager,
|
||||
int *natural_baseline)
|
||||
{
|
||||
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_WIDGET (widget));
|
||||
@ -272,8 +277,20 @@ gtk_layout_manager_measure (GtkLayoutManager *manager,
|
||||
|
||||
klass->measure (manager, widget, orientation,
|
||||
for_size,
|
||||
minimum, natural,
|
||||
minimum_baseline, natural_baseline);
|
||||
&min_size, &nat_size,
|
||||
&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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user