diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-08-09 09:24:39 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-08-09 09:24:39 +0200 |
| commit | 948fa8b9e64d2728b923ee28c80d0adabad0d84b (patch) | |
| tree | fc6045a10165bfc06f24cad40493b99e202fca72 | |
| parent | 541a2c3efb08c47765e302bc7aa0eb6d86305c07 (diff) | |
| download | gtk+-948fa8b9e64d2728b923ee28c80d0adabad0d84b.tar.gz | |
Just use a single grid
The subgrid didn't really add anything.
| -rw-r--r-- | gtk/gtkfontchooser.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c index 4d2e5143b6..63cbbd50f6 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/gtkfontchooser.c @@ -533,7 +533,6 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser) PangoFontDescription *font_desc; GtkWidget *scrolled_win; GtkWidget *grid; - GtkWidget *sub_grid; fontchooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontchooser, GTK_TYPE_FONT_CHOOSER, @@ -585,19 +584,16 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser) /* Basic layout */ grid = gtk_grid_new (); - sub_grid = gtk_grid_new (); gtk_grid_set_column_spacing (GTK_GRID (grid), 6); - gtk_grid_set_row_spacing (GTK_GRID (sub_grid), 6); + gtk_grid_set_row_spacing (GTK_GRID (grid), 6); - gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 3, 1); - gtk_grid_attach (GTK_GRID (grid), scrolled_win, 0, 1, 3, 1); - gtk_grid_attach (GTK_GRID (grid), priv->preview, 0, 2, 3, 1); - gtk_grid_attach (GTK_GRID (grid), sub_grid, 0, 4, 3, 1); + gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 2, 1); + gtk_grid_attach (GTK_GRID (grid), scrolled_win, 0, 1, 2, 1); + gtk_grid_attach (GTK_GRID (grid), priv->preview, 0, 2, 2, 1); - gtk_widget_set_hexpand (GTK_WIDGET (sub_grid), TRUE); - gtk_grid_attach (GTK_GRID (sub_grid), priv->size_slider, 0, 3, 2, 1); - gtk_grid_attach (GTK_GRID (sub_grid), priv->size_spin, 2, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), priv->size_slider, 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), priv->size_spin, 1, 3, 1, 1); gtk_widget_set_hexpand (GTK_WIDGET (scrolled_win), TRUE); gtk_widget_set_vexpand (GTK_WIDGET (scrolled_win), TRUE); @@ -606,7 +602,6 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser) gtk_widget_set_hexpand (GTK_WIDGET (priv->size_slider), TRUE); gtk_widget_set_hexpand (GTK_WIDGET (priv->size_spin), FALSE); - gtk_grid_set_column_homogeneous (GTK_GRID (sub_grid), FALSE); gtk_box_pack_start (GTK_BOX (fontchooser), grid, TRUE, TRUE, 0); /* Setting the adjustment values for the size slider */ @@ -1017,7 +1012,7 @@ gtk_font_chooser_get_face (GtkFontChooser *fontchooser) * or -1 if no font size is selected. * * Since: 3.2 - **/ + */ gint gtk_font_chooser_get_size (GtkFontChooser *fontchooser) { |