dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: fix/enable continuous color updates in GimpColorPanel

This commit is contained in:
Michael Natterer 2012-04-01 15:46:48 +02:00
parent 75f2bc1aac
commit 96dbfc54b4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/widgets/gimpcolorpanel.c
View File

@ -166,8 +166,8 @@ gimp_color_panel_clicked (GtkButton *button)
NULL, NULL,
GTK_WIDGET (button),
NULL, NULL,
(const GimpRGB *) &color,
FALSE,
&color,
gimp_color_button_get_update (GIMP_COLOR_BUTTON (button)),
gimp_color_button_has_alpha (GIMP_COLOR_BUTTON (button)));
g_signal_connect (panel->color_dialog, "destroy",
@ -220,9 +220,18 @@ gimp_color_panel_color_changed (GimpColorButton *button)
if (panel->color_dialog)
{
GimpRGB dialog_color;
gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &color);
gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (panel->color_dialog),
&color);
gimp_color_dialog_get_color (GIMP_COLOR_DIALOG (panel->color_dialog),
&dialog_color);
if (gimp_rgba_distance (&color, &dialog_color) > 0.00001 ||
color.a != dialog_color.a)
{
gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (panel->color_dialog),
&color);
}
}
}
@ -248,13 +257,20 @@ gimp_color_panel_dialog_update (GimpColorDialog *dialog,
switch (state)
{
case GIMP_COLOR_DIALOG_UPDATE:
if (gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
break;
case GIMP_COLOR_DIALOG_OK:
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
/* Fallthrough */
if (! gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
gtk_widget_hide (panel->color_dialog);
break;
case GIMP_COLOR_DIALOG_CANCEL:
if (gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
gtk_widget_hide (panel->color_dialog);
break;
}
}