diff options
| author | raveit65 <[email protected]> | 2016-06-28 11:37:56 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-07-06 17:47:42 +0200 |
| commit | d3159246257fda50e908759c196db04e699bc475 (patch) | |
| tree | b37a31e6885916da6c1059b4e0ce3fef6453043a /src | |
| parent | c5bcad96143a48b6c04107ec8e4d3d554297425c (diff) | |
| download | caja-d3159246257fda50e908759c196db04e699bc475.tar.bz2 caja-d3159246257fda50e908759c196db04e699bc475.tar.xz | |
GTK+-3 fm-properties-window: use widget properties instead of GtkAlignment
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=ba52f92
Diffstat (limited to 'src')
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 9323730c..fb1b9170 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1980,7 +1980,9 @@ attach_combo_box (GtkTable *table, gboolean two_columns) { GtkWidget *combo_box; +#if !GTK_CHECK_VERSION (3, 0, 0) GtkWidget *aligner; +#endif if (!two_columns) { combo_box = gtk_combo_box_text_new (); @@ -1998,6 +2000,9 @@ attach_combo_box (GtkTable *table, "text", 0); } +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (combo_box, GTK_ALIGN_START); +#endif gtk_widget_show (combo_box); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box), @@ -2005,6 +2010,10 @@ attach_combo_box (GtkTable *table, NULL, NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_grid_attach_next_to (grid, combo_box, sibling, + GTK_POS_RIGHT, 1, 1); +#else /* Put combo box in alignment to make it left-justified * but minimally sized. */ @@ -2012,10 +2021,6 @@ attach_combo_box (GtkTable *table, gtk_widget_show (aligner); gtk_container_add (GTK_CONTAINER (aligner), combo_box); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_grid_attach_next_to (grid, aligner, sibling, - GTK_POS_RIGHT, 1, 1); -#else gtk_table_attach (table, aligner, VALUE_COLUMN, VALUE_COLUMN + 1, row, row + 1, @@ -3669,8 +3674,8 @@ create_basic_page (FMPropertiesWindow *window) GtkGrid *grid; #else GtkTable *table; -#endif GtkWidget *icon_aligner; +#endif GtkWidget *icon_pixmap_widget; GtkWidget *volume_usage; GtkWidget *hbox, *vbox; @@ -3685,6 +3690,13 @@ create_basic_page (FMPropertiesWindow *window) icon_pixmap_widget = create_image_widget ( window, should_show_custom_icon_buttons (window)); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (icon_pixmap_widget, GTK_ALIGN_END); + gtk_widget_set_valign (icon_pixmap_widget, GTK_ALIGN_START); + gtk_widget_show (icon_pixmap_widget); + + gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget, FALSE, FALSE, 0); +#else gtk_widget_show (icon_pixmap_widget); icon_aligner = gtk_alignment_new (1, 0, 0, 0); @@ -3692,6 +3704,7 @@ create_basic_page (FMPropertiesWindow *window) gtk_container_add (GTK_CONTAINER (icon_aligner), icon_pixmap_widget); gtk_box_pack_start (GTK_BOX (hbox), icon_aligner, FALSE, FALSE, 0); +#endif window->details->icon_chooser = NULL; |