[gimp/blend-tool-fun: 7/10] app: In GimpBlendTool, sync the operation properties with GimpBlendOptions
- From: Michael Henning <mhenning src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/blend-tool-fun: 7/10] app: In GimpBlendTool, sync the operation properties with GimpBlendOptions
- Date: Sun, 29 Jun 2014 03:26:02 +0000 (UTC)
commit fbd1ee64e3569a2c9112ed515e21a1f604ddb977
Author: Michael Henning <drawoc darkrefraction com>
Date: Tue Jun 24 14:23:55 2014 -0400
app: In GimpBlendTool, sync the operation properties with GimpBlendOptions
app/tools/gimpblendtool.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index f0bcac8..9113b42 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -41,6 +41,8 @@
#include "core/gimpprogress.h"
#include "core/gimpprojection.h"
+#include "gegl/gimp-gegl-config-proxy.h"
+
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h"
@@ -87,8 +89,8 @@ static void gimp_blend_tool_motion (GimpTool *tool,
guint32 time,
GdkModifierType state,
GimpDisplay *display);
-static void gimp_blend_tool_point_motion (GimpBlendTool *blend_tool,
- gboolean constrain_angle);
+static void gimp_blend_tool_point_motion (GimpBlendTool *blend_tool,
+ gboolean constrain_angle);
static gboolean gimp_blend_tool_key_press (GimpTool *tool,
GdkEventKey *kevent,
GimpDisplay *display);
@@ -119,6 +121,9 @@ static void gimp_blend_tool_push_status (GimpBlendTool *blend_
static void gimp_blend_tool_create_graph (GimpBlendTool *blend_tool);
static void gimp_blend_tool_update_preview_coords (GimpBlendTool *blend_tool);
+static void gimp_blend_tool_options_notify (GimpTool *tool,
+ GimpToolOptions *options,
+ const GParamSpec *pspec);
static void gimp_blend_tool_create_image_map (GimpBlendTool *blend_tool,
GimpDrawable *drawable);
@@ -168,6 +173,7 @@ gimp_blend_tool_class_init (GimpBlendToolClass *klass)
tool_class->key_press = gimp_blend_tool_key_press;
tool_class->active_modifier_key = gimp_blend_tool_active_modifier_key;
tool_class->cursor_update = gimp_blend_tool_cursor_update;
+ tool_class->options_notify = gimp_blend_tool_options_notify;
draw_tool_class->draw = gimp_blend_tool_draw;
}
@@ -632,15 +638,19 @@ static void
gimp_blend_tool_start (GimpBlendTool *blend_tool,
GimpDisplay *display)
{
- GimpTool *tool = GIMP_TOOL (blend_tool);
- GimpImage *image = gimp_display_get_image (display);
- GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+ GimpTool *tool = GIMP_TOOL (blend_tool);
+ GimpImage *image = gimp_display_get_image (display);
+ GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+ GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool);
tool->display = display;
tool->drawable = drawable;
gimp_blend_tool_create_image_map (blend_tool, drawable);
+ /* Initially sync all of the properties */
+ gimp_gegl_config_proxy_sync (GIMP_OBJECT (options), blend_tool->render_node);
+
if (! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (blend_tool)))
gimp_draw_tool_start (GIMP_DRAW_TOOL (blend_tool), display);
}
@@ -785,6 +795,29 @@ gimp_blend_tool_update_preview_coords (GimpBlendTool *blend_tool)
NULL);
}
+static void
+gimp_blend_tool_options_notify (GimpTool *tool,
+ GimpToolOptions *options,
+ const GParamSpec *pspec)
+{
+ GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool);
+
+ /* Sync any property changes on the config object that match the op */
+ if (blend_tool->render_node &&
+ gegl_node_find_property (blend_tool->render_node, pspec->name))
+ {
+ GValue value = G_VALUE_INIT;
+ g_value_init (&value, pspec->value_type);
+
+ g_object_get_property (G_OBJECT (options), pspec->name, &value);
+ gegl_node_set_property (blend_tool->render_node, pspec->name, &value);
+
+ g_value_unset (&value);
+
+ gimp_image_map_apply (blend_tool->image_map, NULL);
+ }
+}
+
/* Image map stuff */
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]