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

Bug 467930 - color selectors are not color managed 

Color manage GimpFgBgView.
This commit is contained in:
Michael Natterer 2016-05-28 01:41:46 +02:00
parent 2a7ee53273
commit dbb96f57bb
2 changed files with 84 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/widgets/gimpfgbgview.c
View File

@ -30,6 +30,9 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
@ -44,19 +47,22 @@ enum
}; };
static void gimp_fg_bg_view_dispose (GObject *object); static void gimp_fg_bg_view_dispose (GObject *object);
static void gimp_fg_bg_view_set_property (GObject *object, static void gimp_fg_bg_view_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_fg_bg_view_get_property (GObject *object, static void gimp_fg_bg_view_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static gboolean gimp_fg_bg_view_expose (GtkWidget *widget, static gboolean gimp_fg_bg_view_expose (GtkWidget *widget,
GdkEventExpose *eevent); GdkEventExpose *eevent);
static void gimp_fg_bg_view_config_notify (GimpColorConfig *config,
const GParamSpec *pspec,
GimpFgBgView *view);
G_DEFINE_TYPE (GimpFgBgView, gimp_fg_bg_view, GTK_TYPE_WIDGET) G_DEFINE_TYPE (GimpFgBgView, gimp_fg_bg_view, GTK_TYPE_WIDGET)
@ -168,11 +174,35 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
rect_w = allocation.width * 3 / 4; rect_w = allocation.width * 3 / 4;
rect_h = allocation.height * 3 / 4; rect_h = allocation.height * 3 / 4;
if (! view->transform)
{
static GimpColorProfile *profile = NULL;
if (G_UNLIKELY (! profile))
profile = gimp_color_profile_new_rgb_srgb ();
view->transform =
gimp_widget_get_color_transform (widget,
view->color_config,
profile,
babl_format ("R'G'B'A double"),
babl_format ("R'G'B'A double"));
}
/* draw the background area */ /* draw the background area */
if (view->context) if (view->context)
{ {
gimp_context_get_background (view->context, &color); gimp_context_get_background (view->context, &color);
if (view->transform)
gimp_color_transform_process_pixels (view->transform,
babl_format ("R'G'B'A double"),
&color,
babl_format ("R'G'B'A double"),
&color,
1);
gimp_cairo_set_source_rgb (cr, &color); gimp_cairo_set_source_rgb (cr, &color);
cairo_rectangle (cr, cairo_rectangle (cr,
@ -195,6 +225,15 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
if (view->context) if (view->context)
{ {
gimp_context_get_foreground (view->context, &color); gimp_context_get_foreground (view->context, &color);
if (view->transform)
gimp_color_transform_process_pixels (view->transform,
babl_format ("R'G'B'A double"),
&color,
babl_format ("R'G'B'A double"),
&color,
1);
gimp_cairo_set_source_rgb (cr, &color); gimp_cairo_set_source_rgb (cr, &color);
cairo_rectangle (cr, 1, 1, rect_w - 2, rect_h - 2); cairo_rectangle (cr, 1, 1, rect_w - 2, rect_h - 2);
@ -211,6 +250,21 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
return TRUE; return TRUE;
} }
static void
gimp_fg_bg_view_config_notify (GimpColorConfig *config,
const GParamSpec *pspec,
GimpFgBgView *view)
{
if (view->transform)
{
g_object_unref (view->transform);
view->transform = NULL;
}
gtk_widget_queue_draw (GTK_WIDGET (view));
}
/* public functions */ /* public functions */
GtkWidget * GtkWidget *
@ -240,6 +294,12 @@ gimp_fg_bg_view_set_context (GimpFgBgView *view,
view); view);
g_object_unref (view->context); g_object_unref (view->context);
view->context = NULL; view->context = NULL;
g_signal_handlers_disconnect_by_func (view->color_config,
gimp_fg_bg_view_config_notify,
view);
g_object_unref (view->color_config);
view->color_config = NULL;
} }
view->context = context; view->context = context;
@ -254,7 +314,15 @@ gimp_fg_bg_view_set_context (GimpFgBgView *view,
g_signal_connect_swapped (context, "background-changed", g_signal_connect_swapped (context, "background-changed",
G_CALLBACK (gtk_widget_queue_draw), G_CALLBACK (gtk_widget_queue_draw),
view); view);
view->color_config = g_object_ref (context->gimp->config->color_management);
g_signal_connect (view->color_config, "notify",
G_CALLBACK (gimp_fg_bg_view_config_notify),
view);
} }
gimp_fg_bg_view_config_notify (NULL, NULL, view);
g_object_notify (G_OBJECT (view), "context"); g_object_notify (G_OBJECT (view), "context");
} }

7
app/widgets/gimpfgbgview.h
View File

@ -34,9 +34,11 @@ typedef struct _GimpFgBgViewClass GimpFgBgViewClass;
struct _GimpFgBgView struct _GimpFgBgView
{ {
GtkWidget parent_instance; GtkWidget parent_instance;
GimpContext *context; GimpContext *context;
GimpColorConfig *color_config;
GimpColorTransform *transform;
}; };
struct _GimpFgBgViewClass struct _GimpFgBgViewClass
@ -48,6 +50,7 @@ struct _GimpFgBgViewClass
GType gimp_fg_bg_view_get_type (void) G_GNUC_CONST; GType gimp_fg_bg_view_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_fg_bg_view_new (GimpContext *context); GtkWidget * gimp_fg_bg_view_new (GimpContext *context);
void gimp_fg_bg_view_set_context (GimpFgBgView *view, void gimp_fg_bg_view_set_context (GimpFgBgView *view,
GimpContext *context); GimpContext *context);