diff options
| author | William Jon McCann <jmccann@redhat.com> | 2011-01-20 15:48:00 -0500 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2011-01-20 15:48:00 -0500 |
| commit | f531787875ba7d1b8ec939b375c68fe2ba4d169e (patch) | |
| tree | aee7d7a1cbb08596eb927d892a244167388e62e9 /gtk/gtkappchooserbutton.c | |
| parent | 56009e2226922a96cbc6004e2a25aefa7c4f5063 (diff) | |
| download | gtk+-f531787875ba7d1b8ec939b375c68fe2ba4d169e.tar.gz | |
Don't reserve a column of space the for icons in app chooser button
In order to more consistently present the items regardless of
whether they have icons or not.
Diffstat (limited to 'gtk/gtkappchooserbutton.c')
| -rw-r--r-- | gtk/gtkappchooserbutton.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c index 458deb3659..60732e615d 100644 --- a/gtk/gtkappchooserbutton.c +++ b/gtk/gtkappchooserbutton.c @@ -315,6 +315,7 @@ static void gtk_app_chooser_button_build_ui (GtkAppChooserButton *self) { GtkCellRenderer *cell; + GtkCellArea *area; self->priv->store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_APP_INFO, @@ -327,23 +328,29 @@ gtk_app_chooser_button_build_ui (GtkAppChooserButton *self) gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (self->priv->store)); + area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (self)); + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (self), row_separator_func, NULL, NULL); cell = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE); + gtk_cell_area_add_with_properties (area, cell, + "align", FALSE, + "expand", FALSE, + "fixed-size", FALSE, + NULL); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell, "gicon", COLUMN_ICON, NULL); cell = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, TRUE); + gtk_cell_area_add_with_properties (area, cell, + "align", FALSE, + "expand", TRUE, + NULL); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell, "text", COLUMN_LABEL, NULL); - g_object_set (cell, - "xpad", 6, - NULL); gtk_app_chooser_button_populate (self); } |