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

libgimpwidgets: set the color config on the "GIMP" page of color selectors

This commit is contained in:
Michael Natterer 2016-05-26 22:23:29 +02:00
parent e080df349c
commit bd38b7b9fd
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libgimpwidgets/gimpcolorselect.c
View File

@ -154,6 +154,8 @@ static void gimp_color_select_set_color (GimpColorSelector *selector,
const GimpHSV *hsv); const GimpHSV *hsv);
static void gimp_color_select_set_channel (GimpColorSelector *selector, static void gimp_color_select_set_channel (GimpColorSelector *selector,
GimpColorSelectorChannel channel); GimpColorSelectorChannel channel);
static void gimp_color_select_set_config (GimpColorSelector *selector,
GimpColorConfig *config);
static void gimp_color_select_channel_toggled (GtkWidget *widget, static void gimp_color_select_channel_toggled (GtkWidget *widget,
GimpColorSelect *select); GimpColorSelect *select);
@ -243,6 +245,7 @@ gimp_color_select_class_init (GimpColorSelectClass *klass)
selector_class->set_toggles_sensitive = gimp_color_select_togg_sensitive; selector_class->set_toggles_sensitive = gimp_color_select_togg_sensitive;
selector_class->set_color = gimp_color_select_set_color; selector_class->set_color = gimp_color_select_set_color;
selector_class->set_channel = gimp_color_select_set_channel; selector_class->set_channel = gimp_color_select_set_channel;
selector_class->set_config = gimp_color_select_set_config;
} }
static void static void
@ -266,6 +269,8 @@ gimp_color_select_init (GimpColorSelect *select)
gtk_widget_show (frame); gtk_widget_show (frame);
select->xy_color = gimp_preview_area_new (); select->xy_color = gimp_preview_area_new ();
g_object_add_weak_pointer (G_OBJECT (select->xy_color),
(gpointer) &select->xy_color);
gtk_widget_set_size_request (select->xy_color, gtk_widget_set_size_request (select->xy_color,
GIMP_COLOR_SELECTOR_SIZE, GIMP_COLOR_SELECTOR_SIZE,
GIMP_COLOR_SELECTOR_SIZE); GIMP_COLOR_SELECTOR_SIZE);
@ -295,6 +300,8 @@ gimp_color_select_init (GimpColorSelect *select)
gtk_widget_show (frame); gtk_widget_show (frame);
select->z_color = gimp_preview_area_new (); select->z_color = gimp_preview_area_new ();
g_object_add_weak_pointer (G_OBJECT (select->z_color),
(gpointer) &select->z_color);
gtk_widget_set_size_request (select->z_color, gtk_widget_set_size_request (select->z_color,
GIMP_COLOR_SELECTOR_BAR_SIZE, -1); GIMP_COLOR_SELECTOR_BAR_SIZE, -1);
gtk_widget_set_events (select->z_color, COLOR_AREA_EVENT_MASK); gtk_widget_set_events (select->z_color, COLOR_AREA_EVENT_MASK);
@ -432,6 +439,21 @@ gimp_color_select_set_channel (GimpColorSelector *selector,
UPDATE_POS | UPDATE_Z_COLOR | UPDATE_XY_COLOR); UPDATE_POS | UPDATE_Z_COLOR | UPDATE_XY_COLOR);
} }
static void
gimp_color_select_set_config (GimpColorSelector *selector,
GimpColorConfig *config)
{
GimpColorSelect *select = GIMP_COLOR_SELECT (selector);
if (select->xy_color)
gimp_preview_area_set_color_config (GIMP_PREVIEW_AREA (select->xy_color),
config);
if (select->z_color)
gimp_preview_area_set_color_config (GIMP_PREVIEW_AREA (select->z_color),
config);
}
static void static void
gimp_color_select_channel_toggled (GtkWidget *widget, gimp_color_select_channel_toggled (GtkWidget *widget,
GimpColorSelect *select) GimpColorSelect *select)