views/month: Fix measurement of month view and month rows

The measurement in opposit direction of the one in which
the elements are lined up needs not to add up all the
sizes but just get the maximal size.

This bug leads to too high minimal and natural widths
(and heights) of the month view.

Signed-off-by: Markus Göllnitz <camelcasenick@bewares.it>
This commit is contained in:
Markus Göllnitz
2025-01-22 16:45:23 -03:00
parent af1a73f875
commit 87607efa90
2 changed files with 26 additions and 6 deletions
+10 -2
View File
@@ -431,8 +431,16 @@ gcal_month_view_row_measure (GtkWidget *widget,
NULL);
minimum += child_minimum;
natural += child_natural;
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
minimum += child_minimum;
natural += child_natural;
}
else
{
minimum = MAX(minimum, child_minimum);
natural = MAX(natural, child_natural);
}
}
if (out_minimum)
+16 -4
View File
@@ -1419,11 +1419,23 @@ gcal_month_view_measure (GtkWidget *widget,
}
}
if (minimum)
*minimum = minimum_header_size + minimum_row_size;
if (natural)
*natural = natural_header_size + natural_row_size;
if (orientation == GTK_ORIENTATION_VERTICAL)
{
if (minimum)
*minimum = minimum_header_size + minimum_row_size;
if (natural)
*natural = natural_header_size + natural_row_size;
}
else
{
if (minimum)
*minimum = MAX(minimum_header_size, minimum_row_size);
if (natural)
*natural = MAX(natural_header_size, natural_row_size);
}
if (minimum_baseline)
*minimum_baseline = -1;