[gimp/gimp-2-10] app: rename gimp_drawable_filter_set_preview() to _set_preview_split()
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: rename gimp_drawable_filter_set_preview() to _set_preview_split()
- Date: Thu, 2 Apr 2020 16:05:24 +0000 (UTC)
commit 98e1f6a84620753d272af5a08fae7c738648f95c
Author: Ell <ell_se yahoo com>
Date: Thu Apr 2 12:50:37 2020 +0300
app: rename gimp_drawable_filter_set_preview() to _set_preview_split()
... in preparation for next commit.
Update GimpFilterTool accordingly.
(cherry picked from commit 616530e2355b3976d6243f33fd5e18a69ac9d5c7)
app/core/gimpdrawablefilter.c | 117 +++++++++++++++++++++---------------------
app/core/gimpdrawablefilter.h | 3 +-
app/tools/gimpfilteroptions.c | 38 +++++++-------
app/tools/gimpfilteroptions.h | 4 +-
app/tools/gimpfiltertool.c | 43 ++++++++--------
5 files changed, 104 insertions(+), 101 deletions(-)
---
diff --git a/app/core/gimpdrawablefilter.c b/app/core/gimpdrawablefilter.c
index c9f83642b1..783db63a02 100644
--- a/app/core/gimpdrawablefilter.c
+++ b/app/core/gimpdrawablefilter.c
@@ -69,9 +69,9 @@ struct _GimpDrawableFilter
GimpFilterRegion region;
gboolean crop_enabled;
GeglRectangle crop_rect;
- gboolean preview_enabled;
- GimpAlignmentType preview_alignment;
- gdouble preview_position;
+ gboolean preview_split_enabled;
+ GimpAlignmentType preview_split_alignment;
+ gdouble preview_split_position;
gdouble opacity;
GimpLayerMode paint_mode;
GimpLayerColorSpace blend_space;
@@ -106,9 +106,9 @@ static void gimp_drawable_filter_sync_region (GimpDrawableFilter
static void gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gboolean old_crop_enabled,
const GeglRectangle *old_crop_rect,
- gboolean old_preview_enabled,
- GimpAlignmentType old_preview_alignment,
- gdouble old_preview_position,
+ gboolean old_preview_split_enabled,
+ GimpAlignmentType
old_preview_split_alignment,
+ gdouble
old_preview_split_position,
gboolean update);
static void gimp_drawable_filter_sync_opacity (GimpDrawableFilter *filter);
static void gimp_drawable_filter_sync_mode (GimpDrawableFilter *filter);
@@ -170,15 +170,16 @@ gimp_drawable_filter_class_init (GimpDrawableFilterClass *klass)
static void
gimp_drawable_filter_init (GimpDrawableFilter *drawable_filter)
{
- drawable_filter->clip = TRUE;
- drawable_filter->region = GIMP_FILTER_REGION_SELECTION;
- drawable_filter->preview_alignment = GIMP_ALIGN_LEFT;
- drawable_filter->preview_position = 1.0;
- drawable_filter->opacity = GIMP_OPACITY_OPAQUE;
- drawable_filter->paint_mode = GIMP_LAYER_MODE_REPLACE;
- drawable_filter->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
- drawable_filter->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
- drawable_filter->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
+ drawable_filter->clip = TRUE;
+ drawable_filter->region = GIMP_FILTER_REGION_SELECTION;
+ drawable_filter->preview_split_enabled = FALSE;
+ drawable_filter->preview_split_alignment = GIMP_ALIGN_LEFT;
+ drawable_filter->preview_split_position = 1.0;
+ drawable_filter->opacity = GIMP_OPACITY_OPAQUE;
+ drawable_filter->paint_mode = GIMP_LAYER_MODE_REPLACE;
+ drawable_filter->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+ drawable_filter->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+ drawable_filter->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
}
static void
@@ -351,18 +352,18 @@ gimp_drawable_filter_set_crop (GimpDrawableFilter *filter,
gimp_drawable_filter_sync_crop (filter,
old_enabled,
&old_rect,
- filter->preview_enabled,
- filter->preview_alignment,
- filter->preview_position,
+ filter->preview_split_enabled,
+ filter->preview_split_alignment,
+ filter->preview_split_position,
update);
}
}
void
-gimp_drawable_filter_set_preview (GimpDrawableFilter *filter,
- gboolean enabled,
- GimpAlignmentType alignment,
- gdouble position)
+gimp_drawable_filter_set_preview_split (GimpDrawableFilter *filter,
+ gboolean enabled,
+ GimpAlignmentType alignment,
+ gdouble position)
{
g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
g_return_if_fail (alignment == GIMP_ALIGN_LEFT ||
@@ -372,17 +373,17 @@ gimp_drawable_filter_set_preview (GimpDrawableFilter *filter,
position = CLAMP (position, 0.0, 1.0);
- if (enabled != filter->preview_enabled ||
- alignment != filter->preview_alignment ||
- position != filter->preview_position)
+ if (enabled != filter->preview_split_enabled ||
+ alignment != filter->preview_split_alignment ||
+ position != filter->preview_split_position)
{
- gboolean old_enabled = filter->preview_enabled;
- GimpAlignmentType old_alignment = filter->preview_alignment;
- gdouble old_position = filter->preview_position;
+ gboolean old_enabled = filter->preview_split_enabled;
+ GimpAlignmentType old_alignment = filter->preview_split_alignment;
+ gdouble old_position = filter->preview_split_position;
- filter->preview_enabled = enabled;
- filter->preview_alignment = alignment;
- filter->preview_position = position;
+ filter->preview_split_enabled = enabled;
+ filter->preview_split_alignment = alignment;
+ filter->preview_split_position = position;
gimp_drawable_filter_sync_crop (filter,
filter->crop_enabled,
@@ -542,9 +543,9 @@ gimp_drawable_filter_commit (GimpDrawableFilter *filter,
format = gimp_applicator_get_output_format (filter->applicator);
- gimp_drawable_filter_set_preview (filter, FALSE,
- filter->preview_alignment,
- filter->preview_position);
+ gimp_drawable_filter_set_preview_split (filter, FALSE,
+ filter->preview_split_alignment,
+ filter->preview_split_position);
success = gimp_drawable_merge_filter (filter->drawable,
GIMP_FILTER (filter),
@@ -708,9 +709,9 @@ static gboolean
gimp_drawable_filter_get_crop_rect (GimpDrawableFilter *filter,
gboolean crop_enabled,
const GeglRectangle *crop_rect,
- gboolean preview_enabled,
- GimpAlignmentType preview_alignment,
- gdouble preview_position,
+ gboolean preview_split_enabled,
+ GimpAlignmentType preview_split_alignment,
+ gdouble preview_split_position,
GeglRectangle *rect)
{
GeglRectangle bounds;
@@ -730,24 +731,24 @@ gimp_drawable_filter_get_crop_rect (GimpDrawableFilter *filter,
y1 = bounds.y;
y2 = bounds.y + bounds.height;
- if (preview_enabled)
+ if (preview_split_enabled)
{
- switch (preview_alignment)
+ switch (preview_split_alignment)
{
case GIMP_ALIGN_LEFT:
- x2 = width * preview_position;
+ x2 = width * preview_split_position;
break;
case GIMP_ALIGN_RIGHT:
- x1 = width * preview_position;
+ x1 = width * preview_split_position;
break;
case GIMP_ALIGN_TOP:
- y2 = height * preview_position;
+ y2 = height * preview_split_position;
break;
case GIMP_ALIGN_BOTTOM:
- y1 = height * preview_position;
+ y1 = height * preview_split_position;
break;
default:
@@ -767,9 +768,9 @@ static void
gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gboolean old_crop_enabled,
const GeglRectangle *old_crop_rect,
- gboolean old_preview_enabled,
- GimpAlignmentType old_preview_alignment,
- gdouble old_preview_position,
+ gboolean old_preview_split_enabled,
+ GimpAlignmentType old_preview_split_alignment,
+ gdouble old_preview_split_position,
gboolean update)
{
GeglRectangle old_rect;
@@ -779,17 +780,17 @@ gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gimp_drawable_filter_get_crop_rect (filter,
old_crop_enabled,
old_crop_rect,
- old_preview_enabled,
- old_preview_alignment,
- old_preview_position,
+ old_preview_split_enabled,
+ old_preview_split_alignment,
+ old_preview_split_position,
&old_rect);
enabled = gimp_drawable_filter_get_crop_rect (filter,
filter->crop_enabled,
&filter->crop_rect,
- filter->preview_enabled,
- filter->preview_alignment,
- filter->preview_position,
+ filter->preview_split_enabled,
+ filter->preview_split_alignment,
+ filter->preview_split_position,
&new_rect);
gimp_applicator_set_crop (filter->applicator, enabled ? &new_rect : NULL);
@@ -1072,9 +1073,9 @@ gimp_drawable_filter_add_filter (GimpDrawableFilter *filter)
gimp_drawable_filter_sync_crop (filter,
filter->crop_enabled,
&filter->crop_rect,
- filter->preview_enabled,
- filter->preview_alignment,
- filter->preview_position,
+ filter->preview_split_enabled,
+ filter->preview_split_alignment,
+ filter->preview_split_position,
TRUE);
gimp_drawable_filter_sync_opacity (filter);
gimp_drawable_filter_sync_mode (filter);
@@ -1188,9 +1189,9 @@ gimp_drawable_filter_update_drawable (GimpDrawableFilter *filter,
gimp_drawable_filter_get_crop_rect (filter,
filter->crop_enabled,
&filter->crop_rect,
- filter->preview_enabled,
- filter->preview_alignment,
- filter->preview_position,
+ filter->preview_split_enabled,
+ filter->preview_split_alignment,
+ filter->preview_split_position,
&update_area);
if (! gegl_rectangle_intersect (&update_area,
diff --git a/app/core/gimpdrawablefilter.h b/app/core/gimpdrawablefilter.h
index b8584dd6b2..da5ccc2ae6 100644
--- a/app/core/gimpdrawablefilter.h
+++ b/app/core/gimpdrawablefilter.h
@@ -62,7 +62,8 @@ void gimp_drawable_filter_set_region (GimpDrawableFilter *filter,
void gimp_drawable_filter_set_crop (GimpDrawableFilter *filter,
const GeglRectangle *rect,
gboolean update);
-void gimp_drawable_filter_set_preview (GimpDrawableFilter *filter,
+void gimp_drawable_filter_set_preview_split
+ (GimpDrawableFilter *filter,
gboolean enabled,
GimpAlignmentType alignment,
gdouble split_position);
diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c
index 13b47cfbbb..fc491f4d7b 100644
--- a/app/tools/gimpfilteroptions.c
+++ b/app/tools/gimpfilteroptions.c
@@ -34,8 +34,8 @@ enum
PROP_0,
PROP_PREVIEW,
PROP_PREVIEW_SPLIT,
- PROP_PREVIEW_ALIGNMENT,
- PROP_PREVIEW_POSITION,
+ PROP_PREVIEW_SPLIT_ALIGNMENT,
+ PROP_PREVIEW_SPLIT_POSITION,
PROP_CONTROLLER,
PROP_CLIP,
PROP_REGION,
@@ -83,16 +83,16 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class, PROP_PREVIEW_ALIGNMENT,
- g_param_spec_enum ("preview-alignment",
+ g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_ALIGNMENT,
+ g_param_spec_enum ("preview-split-alignment",
NULL, NULL,
GIMP_TYPE_ALIGNMENT_TYPE,
GIMP_ALIGN_LEFT,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class, PROP_PREVIEW_POSITION,
- g_param_spec_double ("preview-position",
+ g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_POSITION,
+ g_param_spec_double ("preview-split-position",
NULL, NULL,
0.0, 1.0, 0.5,
GIMP_PARAM_READWRITE |
@@ -161,12 +161,12 @@ gimp_filter_options_set_property (GObject *object,
options->preview_split = g_value_get_boolean (value);
break;
- case PROP_PREVIEW_ALIGNMENT:
- options->preview_alignment = g_value_get_enum (value);
+ case PROP_PREVIEW_SPLIT_ALIGNMENT:
+ options->preview_split_alignment = g_value_get_enum (value);
break;
- case PROP_PREVIEW_POSITION:
- options->preview_position = g_value_get_double (value);
+ case PROP_PREVIEW_SPLIT_POSITION:
+ options->preview_split_position = g_value_get_double (value);
break;
case PROP_CONTROLLER:
@@ -213,12 +213,12 @@ gimp_filter_options_get_property (GObject *object,
g_value_set_boolean (value, options->preview_split);
break;
- case PROP_PREVIEW_ALIGNMENT:
- g_value_set_enum (value, options->preview_alignment);
+ case PROP_PREVIEW_SPLIT_ALIGNMENT:
+ g_value_set_enum (value, options->preview_split_alignment);
break;
- case PROP_PREVIEW_POSITION:
- g_value_set_double (value, options->preview_position);
+ case PROP_PREVIEW_SPLIT_POSITION:
+ g_value_set_double (value, options->preview_split_position);
break;
case PROP_CONTROLLER:
@@ -257,7 +257,7 @@ gimp_filter_options_switch_preview_side (GimpFilterOptions *options)
g_return_if_fail (GIMP_IS_FILTER_OPTIONS (options));
- switch (options->preview_alignment)
+ switch (options->preview_split_alignment)
{
case GIMP_ALIGN_LEFT: alignment = GIMP_ALIGN_RIGHT; break;
case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_LEFT; break;
@@ -267,7 +267,7 @@ gimp_filter_options_switch_preview_side (GimpFilterOptions *options)
g_return_if_reached ();
}
- g_object_set (options, "preview-alignment", alignment, NULL);
+ g_object_set (options, "preview-split-alignment", alignment, NULL);
}
void
@@ -280,7 +280,7 @@ gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
g_return_if_fail (GIMP_IS_FILTER_OPTIONS (options));
- switch (options->preview_alignment)
+ switch (options->preview_split_alignment)
{
case GIMP_ALIGN_LEFT: alignment = GIMP_ALIGN_TOP; break;
case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_BOTTOM; break;
@@ -301,7 +301,7 @@ gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
}
g_object_set (options,
- "preview-alignment", alignment,
- "preview-position", CLAMP (position, 0.0, 1.0),
+ "preview-split-alignment", alignment,
+ "preview-split-position", CLAMP (position, 0.0, 1.0),
NULL);
}
diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h
index 0c35c68ac0..6518aefa2d 100644
--- a/app/tools/gimpfilteroptions.h
+++ b/app/tools/gimpfilteroptions.h
@@ -38,8 +38,8 @@ struct _GimpFilterOptions
gboolean preview;
gboolean preview_split;
- GimpAlignmentType preview_alignment;
- gdouble preview_position;
+ GimpAlignmentType preview_split_alignment;
+ gdouble preview_split_position;
gboolean controller;
GimpTransformResize clip;
GimpFilterRegion region;
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
index 785155fa8c..4857eadc05 100644
--- a/app/tools/gimpfiltertool.c
+++ b/app/tools/gimpfiltertool.c
@@ -760,8 +760,8 @@ gimp_filter_tool_options_notify (GimpTool *tool,
{
gdouble position;
- if (filter_options->preview_alignment == GIMP_ALIGN_LEFT ||
- filter_options->preview_alignment == GIMP_ALIGN_RIGHT)
+ if (filter_options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+ filter_options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{
position = ((gdouble) ((x + width / 2) -
gimp_item_get_offset_x (item)) /
@@ -774,9 +774,10 @@ gimp_filter_tool_options_notify (GimpTool *tool,
(gdouble) gimp_item_get_height (item));
}
- g_object_set (options,
- "preview-position", CLAMP (position, 0.0, 1.0),
- NULL);
+ g_object_set (
+ options,
+ "preview-split-position", CLAMP (position, 0.0, 1.0),
+ NULL);
}
}
@@ -787,8 +788,8 @@ gimp_filter_tool_options_notify (GimpTool *tool,
else
gimp_filter_tool_remove_guide (filter_tool);
}
- else if (! strcmp (pspec->name, "preview-alignment") ||
- ! strcmp (pspec->name, "preview-position"))
+ else if (! strcmp (pspec->name, "preview-split-alignment") ||
+ ! strcmp (pspec->name, "preview-split-position"))
{
gimp_filter_tool_update_filter (filter_tool);
@@ -1224,14 +1225,14 @@ gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
item = GIMP_ITEM (tool->drawable);
image = gimp_item_get_image (item);
- if (options->preview_alignment == GIMP_ALIGN_LEFT ||
- options->preview_alignment == GIMP_ALIGN_RIGHT)
+ if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+ options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{
orientation = GIMP_ORIENTATION_VERTICAL;
position = (gimp_item_get_offset_x (item) +
gimp_item_get_width (item) *
- options->preview_position);
+ options->preview_split_position);
}
else
{
@@ -1239,7 +1240,7 @@ gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
position = (gimp_item_get_offset_y (item) +
gimp_item_get_height (item) *
- options->preview_position);
+ options->preview_split_position);
}
filter_tool->preview_guide =
@@ -1285,14 +1286,14 @@ gimp_filter_tool_move_guide (GimpFilterTool *filter_tool)
item = GIMP_ITEM (tool->drawable);
- if (options->preview_alignment == GIMP_ALIGN_LEFT ||
- options->preview_alignment == GIMP_ALIGN_RIGHT)
+ if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+ options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{
orientation = GIMP_ORIENTATION_VERTICAL;
position = (gimp_item_get_offset_x (item) +
gimp_item_get_width (item) *
- options->preview_position);
+ options->preview_split_position);
}
else
{
@@ -1300,7 +1301,7 @@ gimp_filter_tool_move_guide (GimpFilterTool *filter_tool)
position = (gimp_item_get_offset_y (item) +
gimp_item_get_height (item) *
- options->preview_position);
+ options->preview_split_position);
}
if (orientation != gimp_guide_get_orientation (filter_tool->preview_guide) ||
@@ -1342,8 +1343,8 @@ gimp_filter_tool_guide_moved (GimpGuide *guide,
GimpItem *item = GIMP_ITEM (tool->drawable);
gdouble position;
- if (options->preview_alignment == GIMP_ALIGN_LEFT ||
- options->preview_alignment == GIMP_ALIGN_RIGHT)
+ if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+ options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{
position = ((gdouble) (gimp_guide_get_position (guide) -
gimp_item_get_offset_x (item)) /
@@ -1357,7 +1358,7 @@ gimp_filter_tool_guide_moved (GimpGuide *guide,
}
g_object_set (options,
- "preview-position", CLAMP (position, 0.0, 1.0),
+ "preview-split-position", CLAMP (position, 0.0, 1.0),
NULL);
}
@@ -1405,7 +1406,7 @@ gimp_filter_tool_update_filter (GimpFilterTool *filter_tool)
clip);
gimp_drawable_filter_set_region (filter_tool->filter,
options->region);
- gimp_drawable_filter_set_preview (filter_tool->filter,
+ gimp_drawable_filter_set_preview_split (filter_tool->filter,
options->preview_split,
options->preview_alignment,
options->preview_position);
@@ -1578,8 +1579,8 @@ gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
g_free (operation_name);
g_object_set (GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool),
- "preview-split", FALSE,
- "preview-position", 0.5,
+ "preview-split", FALSE,
+ "preview-split-position", 0.5,
NULL);
g_signal_connect_object (filter_tool->config, "notify",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
