Merge branch 'fix-1788' into 'gtk-3-24'

flowbox: children per line may not be 0

See merge request GNOME/gtk!687
This commit is contained in:
Matthias Clasen 2019-03-30 12:27:10 +00:00
commit 8a15a7bd5f

View File

@ -3880,7 +3880,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
P_("Maximum Children Per Line"),
P_("The maximum amount of children to request space for "
"consecutively in the given orientation."),
0, G_MAXUINT, DEFAULT_MAX_CHILDREN_PER_LINE,
1, G_MAXUINT, DEFAULT_MAX_CHILDREN_PER_LINE,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/**
@ -4715,6 +4715,7 @@ gtk_flow_box_set_max_children_per_line (GtkFlowBox *box,
guint n_children)
{
g_return_if_fail (GTK_IS_FLOW_BOX (box));
g_return_if_fail (n_children > 0);
if (BOX_PRIV (box)->max_children_per_line != n_children)
{