diff options
| author | Timm Bäder <mail@baedert.org> | 2017-04-21 18:59:59 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-04-25 20:30:37 +0200 |
| commit | 5729ea7744c2a41ae8fb833db6690a6aa5ad7a84 (patch) | |
| tree | ddda46f8b6c07a999ee9b844ec3a9c863b55a850 /gtk/gtkmenusectionbox.c | |
| parent | 8f4c0bea6558dc98a2abd7e63436b1ce4caf689e (diff) | |
| download | gtk+-5729ea7744c2a41ae8fb833db6690a6aa5ad7a84.tar.gz | |
box: Remove expand child property
GtkWidget already has hexpand/vexpand properties.
Diffstat (limited to 'gtk/gtkmenusectionbox.c')
| -rw-r--r-- | gtk/gtkmenusectionbox.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index 4d863673d7..9dda6a9085 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -134,7 +134,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box, return; if (should_have_separator) - gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE); else gtk_container_remove (GTK_CONTAINER (box), box->separator); } @@ -326,10 +326,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item, g_object_set_data_full (G_OBJECT (widget), "GtkMenuTrackerItem", g_object_ref (item), g_object_unref); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); - if (box->iconic) - gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE, TRUE); - else - gtk_container_add (GTK_CONTAINER (box->item_box), widget); + gtk_container_add (GTK_CONTAINER (box->item_box), widget); gtk_box_reorder_child (GTK_BOX (box->item_box), widget, position); gtk_menu_section_box_schedule_separator_sync (box); @@ -346,7 +343,7 @@ gtk_menu_section_box_init (GtkMenuSectionBox *box) item_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); box->item_box = GTK_BOX (item_box); - gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (box), item_box, FALSE); gtk_widget_set_halign (GTK_WIDGET (item_box), GTK_ALIGN_FILL); gtk_widget_set_halign (GTK_WIDGET (box), GTK_ALIGN_FILL); @@ -454,7 +451,7 @@ gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item, g_object_set_data (G_OBJECT (button), "focus", focus); g_object_set_data (G_OBJECT (focus), "focus", button); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); g_signal_connect (focus, "clicked", G_CALLBACK (open_submenu), item); g_signal_connect (button, "clicked", G_CALLBACK (close_submenu), item); @@ -487,6 +484,7 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, if (hint && g_str_equal (hint, "horizontal-buttons")) { + gtk_box_set_homogeneous (box->item_box, TRUE); gtk_orientable_set_orientation (GTK_ORIENTABLE (box->item_box), GTK_ORIENTATION_HORIZONTAL); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (box->item_box)), GTK_STYLE_CLASS_LINKED); box->iconic = TRUE; @@ -514,17 +512,17 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE); title = gtk_label_new (label); g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); gtk_style_context_add_class (gtk_widget_get_style_context (title), GTK_STYLE_CLASS_SEPARATOR); gtk_widget_set_halign (title, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE); } else { |