comparison gtk3/dw.c @ 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 0cd0089ee17d
children a1deca9b0876
comparison
equal deleted inserted replaced
1065:25e0317335fc 1066:2accf180bcfe
8078 else 8078 else
8079 gtk_table_resize(GTK_TABLE(box), 1, boxcount + 1); 8079 gtk_table_resize(GTK_TABLE(box), 1, boxcount + 1);
8080 8080
8081 gtk_table_attach(GTK_TABLE(box), item, 0, 1, 0, 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad); 8081 gtk_table_attach(GTK_TABLE(box), item, 0, 1, 0, 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad);
8082 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1)); 8082 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
8083 gtk_widget_set_size_request(item, width, height); 8083 if(GTK_IS_SCROLLED_WINDOW(item))
8084 {
8085 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
8086 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
8087 }
8088 else
8089 gtk_widget_set_size_request(item, width, height);
8084 if(GTK_IS_RADIO_BUTTON(item)) 8090 if(GTK_IS_RADIO_BUTTON(item))
8085 { 8091 {
8086 GSList *group; 8092 GSList *group;
8087 GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group"); 8093 GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group");
8088 8094
9450 gtk_table_resize(GTK_TABLE(box), 1, boxcount + 1); 9456 gtk_table_resize(GTK_TABLE(box), 1, boxcount + 1);
9451 } 9457 }
9452 9458
9453 gtk_table_attach(GTK_TABLE(box), item, x, x + 1, y, y + 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad); 9459 gtk_table_attach(GTK_TABLE(box), item, x, x + 1, y, y + 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad);
9454 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1)); 9460 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
9455 gtk_widget_set_size_request(item, width, height); 9461 if(GTK_IS_SCROLLED_WINDOW(item))
9462 {
9463 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
9464 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
9465 }
9466 else
9467 gtk_widget_set_size_request(item, width, height);
9456 if (GTK_IS_RADIO_BUTTON(item)) 9468 if (GTK_IS_RADIO_BUTTON(item))
9457 { 9469 {
9458 GSList *group; 9470 GSList *group;
9459 GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group"); 9471 GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group");
9460 9472