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

columnviewlayout: Handle for_size propertly

Browse Source 
When we are given a for_size as width for the whole
column view, we need to distribute it over the columns
as gtk_column_view_allocate_columns would, in order
to find out which for_size to give to each cell.

This is a bit recursive, but works. Since we are
doing this recursion for every row, we should consider
adding a cache for those distributed widths.
This commit is contained in:
Matthias Clasen 2020-06-05 11:34:51 -04:00
parent f6da324670
commit 40f6a9d830
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkcolumnviewlayout.c
View File

@ -47,10 +47,19 @@ gtk_column_view_layout_measure_along (GtkColumnViewLayout *self,
{ {
GtkOrientation orientation = GTK_ORIENTATION_VERTICAL; GtkOrientation orientation = GTK_ORIENTATION_VERTICAL;
GtkWidget *child; GtkWidget *child;
guint i, n;
GtkRequestedSize *sizes = NULL;
for (child = _gtk_widget_get_first_child (widget); if (for_size > -1)
{
n = g_list_model_get_n_items (gtk_column_view_get_columns (self->view));
sizes = g_newa (GtkRequestedSize, n);
gtk_column_view_distribute_width (self->view, for_size, sizes);
}
for (child = _gtk_widget_get_first_child (widget), i = 0;
child != NULL; child != NULL;
child = _gtk_widget_get_next_sibling (child)) child = _gtk_widget_get_next_sibling (child), i++)
{ {
int child_min = 0; int child_min = 0;
int child_nat = 0; int child_nat = 0;
@ -60,7 +69,8 @@ gtk_column_view_layout_measure_along (GtkColumnViewLayout *self,
if (!gtk_widget_should_layout (child)) if (!gtk_widget_should_layout (child))
continue; continue;
gtk_widget_measure (child, orientation, for_size, gtk_widget_measure (child, orientation,
for_size > -1 ? sizes[i].minimum_size : -1,
&child_min, &child_nat, &child_min, &child_nat,
&child_min_baseline, &child_nat_baseline); &child_min_baseline, &child_nat_baseline);