From 2c24e3cb6a1946e927eae6f47142e833c1f88432 Mon Sep 17 00:00:00 2001 From: Jon McCann Date: Mon, 30 Jan 2012 21:06:13 -0500 Subject: [PATCH] Align label with swatches --- gtk/gtkcolorchooserwidget.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index f6f3cf7935..52bdffc391 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -248,7 +248,6 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) gtk_container_add (GTK_CONTAINER (cc), cc->priv->palette); cc->priv->colors = grid = gtk_grid_new (); - g_object_set (grid, "margin", 12, NULL); gtk_widget_set_margin_bottom (grid, 12); gtk_grid_set_row_spacing (GTK_GRID (grid), 2); gtk_grid_set_column_spacing (GTK_GRID (grid), 4); @@ -276,7 +275,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) } cc->priv->grays = grid = gtk_grid_new (); - g_object_set (grid, "margin", 12, "margin-top", 0, NULL); + g_object_set (grid, "margin-bottom", 18, NULL); gtk_grid_set_column_spacing (GTK_GRID (grid), 4); gtk_container_add (GTK_CONTAINER (cc->priv->palette), grid); @@ -298,13 +297,12 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) gtk_grid_attach (GTK_GRID (grid), p, i, 0, 1, 1); } - label = gtk_label_new (_("Custom color")); + label = gtk_label_new (_("Custom")); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_container_add (GTK_CONTAINER (cc->priv->palette), label); - g_object_set (grid, "margin", 12, "margin-top", 0, NULL); cc->priv->custom = grid = gtk_grid_new (); - g_object_set (grid, "margin", 12, "margin-top", 0, NULL); + g_object_set (grid, "margin-top", 12, NULL); gtk_grid_set_column_spacing (GTK_GRID (grid), 4); gtk_container_add (GTK_CONTAINER (cc->priv->palette), grid);