changeset 1066:2accf180bcfe

Fix for required sizes not functioning properly for items who are in scrolled windows.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 14 Jun 2011 13:38:55 +0000
parents 25e0317335fc
children 6ca1132a240e
files gtk3/dw.c
diffstat 1 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gtk3/dw.c	Sun Jun 12 15:06:30 2011 +0000
+++ b/gtk3/dw.c	Tue Jun 14 13:38:55 2011 +0000
@@ -8080,7 +8080,13 @@
 
       gtk_table_attach(GTK_TABLE(box), item, 0, 1, 0, 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad);
       g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
-      gtk_widget_set_size_request(item, width, height);
+      if(GTK_IS_SCROLLED_WINDOW(item))
+      {
+         gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
+         gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
+      }
+      else
+         gtk_widget_set_size_request(item, width, height);
       if(GTK_IS_RADIO_BUTTON(item))
       {
          GSList *group;
@@ -9452,7 +9458,13 @@
 
       gtk_table_attach(GTK_TABLE(box), item, x, x + 1, y, y + 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad);
       g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
-      gtk_widget_set_size_request(item, width, height);
+      if(GTK_IS_SCROLLED_WINDOW(item))
+      {
+         gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
+         gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
+      }
+      else
+         gtk_widget_set_size_request(item, width, height);
       if (GTK_IS_RADIO_BUTTON(item))
       {
          GSList *group;