columnviewcellwidget: Ensure for_size is large enough

When clipping, we still need to do proper size requests.

diff --git a/gtk/gtkcolumnviewcellwidget.c b/gtk/gtkcolumnviewcellwidget.c
index ecbc2806d696292941bbd5d360830967d9f74543..82bd843bb45db429ff26bcf2215e9b4c2ff988c0 100644 (file)
--- a/gtk/gtkcolumnviewcellwidget.c
+++ b/gtk/gtkcolumnviewcellwidget.c
@@ -108,10 +108,15 @@ gtk_column_view_cell_widget_measure (GtkWidget      *widget,
     {
       if (fixed_width > -1)
         {
+          int min;
+
           if (for_size == -1)
             for_size = unadj_width;
           else
             for_size = MIN (for_size, unadj_width);
+
+          gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL);
+          for_size = MAX (for_size, min);
         }
     }
 

diff --git a/gtk/gtkcolumnviewtitle.c b/gtk/gtkcolumnviewtitle.c
index b55e9808218dd2f553159359495f15e19bb05614..43ae56224fc61af0e8a7ca1df91bd96fca814bf4 100644 (file)
--- a/gtk/gtkcolumnviewtitle.c
+++ b/gtk/gtkcolumnviewtitle.c
@@ -90,10 +90,15 @@ gtk_column_view_title_measure (GtkWidget      *widget,
     {
       if (fixed_width > -1)
         {
+          int min;
+
           if (for_size == -1)
             for_size = unadj_width;
           else
             for_size = MIN (for_size, unadj_width);
+
+          gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL);
+          for_size = MAX (for_size, min);
         }
     }