diff options
| author | Ernestas Kulik <ernestas.kulik@gmail.com> | 2016-04-07 16:16:35 +0300 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-04-14 11:42:07 +0200 |
| commit | ba52f92548b1b8af7bf76c6b4fde42dcf35554a4 (patch) | |
| tree | d04895a6233ba7b1fdb2d1eb73c18f0a4aaad772 | |
| parent | 76bfc989aa3410faa76835d08a679625d986d192 (diff) | |
| download | nautilus-ba52f92548b1b8af7bf76c6b4fde42dcf35554a4.tar.gz | |
properties-window: use widget properties instead of GtkAlignment
GtkAlignment has been deprecated since GTK+ 3.14 and the use of halign,
valign and margin properties is encouraged.
This commit aligns widgets by use of said properties instead of the
GtkAlignment widget.
https://bugzilla.gnome.org/show_bug.cgi?id=762238
| -rw-r--r-- | src/nautilus-properties-window.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index 7ed2ef21d..986b107f6 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -1677,7 +1677,6 @@ attach_combo_box (GtkGrid *grid, gboolean three_columns) { GtkWidget *combo_box; - GtkWidget *aligner; if (!three_columns) { combo_box = gtk_combo_box_text_new (); @@ -1695,6 +1694,7 @@ attach_combo_box (GtkGrid *grid, "text", 0); } + gtk_widget_set_halign (combo_box, GTK_ALIGN_START); gtk_widget_show (combo_box); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box), @@ -1702,14 +1702,7 @@ attach_combo_box (GtkGrid *grid, NULL, NULL); - /* Put combo box in alignment to make it left-justified - * but minimally sized. - */ - aligner = gtk_alignment_new (0, 0.5, 0, 0); - gtk_widget_show (aligner); - - gtk_container_add (GTK_CONTAINER (aligner), combo_box); - gtk_grid_attach_next_to (grid, aligner, sibling, + gtk_grid_attach_next_to (grid, combo_box, sibling, GTK_POS_RIGHT, 1, 1); return GTK_COMBO_BOX (combo_box); @@ -2887,7 +2880,6 @@ static void create_basic_page (NautilusPropertiesWindow *window) { GtkGrid *grid; - GtkWidget *icon_aligner; GtkWidget *icon_pixmap_widget; GtkWidget *volume_usage; GtkWidget *hbox, *vbox; @@ -2899,13 +2891,10 @@ create_basic_page (NautilusPropertiesWindow *window) icon_pixmap_widget = create_image_widget ( window, should_show_custom_icon_buttons (window)); + gtk_widget_set_valign (icon_pixmap_widget, GTK_ALIGN_START); gtk_widget_show (icon_pixmap_widget); - icon_aligner = gtk_alignment_new (1, 0, 0, 0); - gtk_widget_show (icon_aligner); - - gtk_container_add (GTK_CONTAINER (icon_aligner), icon_pixmap_widget); - gtk_box_pack_start (GTK_BOX (hbox), icon_aligner, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget, FALSE, FALSE, 0); window->details->icon_chooser = NULL; |