From bdb8931bda509f2a50250cc96928f2f73f9f0779 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Feb 2012 02:00:21 -0500 Subject: [PATCH] Fix a few problems with custom color replacement We were allowing one too many custom colors in, and when one of them was dropped, we did not update the shape of the penultimate one. --- gtk/gtkcolorchooserwidget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index 04ac168db0..7888d10bac 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -483,9 +483,13 @@ add_custom_color (GtkColorChooserWidget *cc, GtkWidget *last; GtkWidget *p; - last = gtk_grid_get_child_at (GTK_GRID (cc->priv->custom), 9, 0); + last = gtk_grid_get_child_at (GTK_GRID (cc->priv->custom), 8, 0); if (last) - gtk_container_remove (GTK_CONTAINER (cc->priv->custom), last); + { + gtk_container_remove (GTK_CONTAINER (cc->priv->custom), last); + last = gtk_grid_get_child_at (GTK_GRID (cc->priv->custom), 7, 0); + gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (last), 1, 10, 10, 1); + } gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (cc->priv->button), 10, 1, 1, 10);