diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtkcolorbutton.c | 14 |
6 files changed, 48 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Jan 21 18:10:40 2004 Jonathan Blandford <jrb@gnome.org> + + * gtk/gtkcolorbutton.c (gtk_color_button_set_color):redraw the + color button when an alpha is set. + (gtk_color_button_set_alpha): redraw the color button when an + alpha is set. + Wed Jan 21 23:27:14 2004 Matthias Clasen <maclas@gmx.de> Fix #131869: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a74d6da32..78af4485c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Jan 21 18:10:40 2004 Jonathan Blandford <jrb@gnome.org> + + * gtk/gtkcolorbutton.c (gtk_color_button_set_color):redraw the + color button when an alpha is set. + (gtk_color_button_set_alpha): redraw the color button when an + alpha is set. + Wed Jan 21 23:27:14 2004 Matthias Clasen <maclas@gmx.de> Fix #131869: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a74d6da32..78af4485c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Jan 21 18:10:40 2004 Jonathan Blandford <jrb@gnome.org> + + * gtk/gtkcolorbutton.c (gtk_color_button_set_color):redraw the + color button when an alpha is set. + (gtk_color_button_set_alpha): redraw the color button when an + alpha is set. + Wed Jan 21 23:27:14 2004 Matthias Clasen <maclas@gmx.de> Fix #131869: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a74d6da32..78af4485c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Jan 21 18:10:40 2004 Jonathan Blandford <jrb@gnome.org> + + * gtk/gtkcolorbutton.c (gtk_color_button_set_color):redraw the + color button when an alpha is set. + (gtk_color_button_set_alpha): redraw the color button when an + alpha is set. + Wed Jan 21 23:27:14 2004 Matthias Clasen <maclas@gmx.de> Fix #131869: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a74d6da32..78af4485c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Jan 21 18:10:40 2004 Jonathan Blandford <jrb@gnome.org> + + * gtk/gtkcolorbutton.c (gtk_color_button_set_color):redraw the + color button when an alpha is set. + (gtk_color_button_set_alpha): redraw the color button when an + alpha is set. + Wed Jan 21 23:27:14 2004 Matthias Clasen <maclas@gmx.de> Fix #131869: diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index deef2dde5..ab0e69873 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -784,6 +784,12 @@ gtk_color_button_set_color (GtkColorButton *color_button, color_button->priv->color.green = color->green; color_button->priv->color.blue = color->blue; + if (color_button->priv->pixbuf != NULL) + g_object_unref (color_button->priv->pixbuf); + color_button->priv->pixbuf = NULL; + + gtk_widget_queue_draw (color_button->priv->drawing_area); + g_object_notify (G_OBJECT (color_button), "color"); } @@ -804,7 +810,13 @@ gtk_color_button_set_alpha (GtkColorButton *color_button, g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button)); color_button->priv->alpha = alpha; - + + if (color_button->priv->pixbuf != NULL) + g_object_unref (color_button->priv->pixbuf); + color_button->priv->pixbuf = NULL; + + gtk_widget_queue_draw (color_button->priv->drawing_area); + g_object_notify (G_OBJECT (color_button), "alpha"); } |