callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename gimp_drawable_filter_set_preview() to _set_preview_split()

Browse Source 
... in preparation for next commit.

Update GimpFilterTool accordingly.
This commit is contained in:
Ell
2020-04-02 12:50:37 +03:00
parent e324e2d4b3
commit 616530e235
5 changed files with 115 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
app/core/gimpdrawablefilter.c
View File

@ -68,9 +68,9 @@ struct _GimpDrawableFilter
GimpFilterRegion region; GimpFilterRegion region;
gboolean crop_enabled; gboolean crop_enabled;
GeglRectangle crop_rect; GeglRectangle crop_rect;
gboolean preview_enabled; gboolean preview_split_enabled;
GimpAlignmentType preview_alignment; GimpAlignmentType preview_split_alignment;
gdouble preview_position; gdouble preview_split_position;
gdouble opacity; gdouble opacity;
GimpLayerMode paint_mode; GimpLayerMode paint_mode;
GimpLayerColorSpace blend_space; GimpLayerColorSpace blend_space;
@ -103,9 +103,9 @@ static void gimp_drawable_filter_sync_region (GimpDrawableFilter
static void gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter, static void gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gboolean old_crop_enabled, gboolean old_crop_enabled,
const GeglRectangle *old_crop_rect, const GeglRectangle *old_crop_rect,
gboolean old_preview_enabled, gboolean old_preview_split_enabled,
GimpAlignmentType old_preview_alignment, GimpAlignmentType old_preview_split_alignment,
gdouble old_preview_position, gdouble old_preview_split_position,
gboolean update); gboolean update);
static void gimp_drawable_filter_sync_opacity (GimpDrawableFilter *filter); static void gimp_drawable_filter_sync_opacity (GimpDrawableFilter *filter);
static void gimp_drawable_filter_sync_mode (GimpDrawableFilter *filter); static void gimp_drawable_filter_sync_mode (GimpDrawableFilter *filter);
@ -165,8 +165,9 @@ gimp_drawable_filter_init (GimpDrawableFilter *drawable_filter)
{ {
drawable_filter->clip = TRUE; drawable_filter->clip = TRUE;
drawable_filter->region = GIMP_FILTER_REGION_SELECTION; drawable_filter->region = GIMP_FILTER_REGION_SELECTION;
drawable_filter->preview_alignment = GIMP_ALIGN_LEFT; drawable_filter->preview_split_enabled = FALSE;
drawable_filter->preview_position = 1.0; drawable_filter->preview_split_alignment = GIMP_ALIGN_LEFT;
drawable_filter->preview_split_position = 1.0;
drawable_filter->opacity = GIMP_OPACITY_OPAQUE; drawable_filter->opacity = GIMP_OPACITY_OPAQUE;
drawable_filter->paint_mode = GIMP_LAYER_MODE_REPLACE; drawable_filter->paint_mode = GIMP_LAYER_MODE_REPLACE;
drawable_filter->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; drawable_filter->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
@ -334,15 +335,15 @@ gimp_drawable_filter_set_crop (GimpDrawableFilter *filter,
gimp_drawable_filter_sync_crop (filter, gimp_drawable_filter_sync_crop (filter,
old_enabled, old_enabled,
&old_rect, &old_rect,
filter->preview_enabled, filter->preview_split_enabled,
filter->preview_alignment, filter->preview_split_alignment,
filter->preview_position, filter->preview_split_position,
update); update);
} }
} }
void void
gimp_drawable_filter_set_preview (GimpDrawableFilter *filter, gimp_drawable_filter_set_preview_split (GimpDrawableFilter *filter,
gboolean enabled, gboolean enabled,
GimpAlignmentType alignment, GimpAlignmentType alignment,
gdouble position) gdouble position)
@ -355,17 +356,17 @@ gimp_drawable_filter_set_preview (GimpDrawableFilter *filter,
position = CLAMP (position, 0.0, 1.0); position = CLAMP (position, 0.0, 1.0);
if (enabled != filter->preview_enabled || if (enabled != filter->preview_split_enabled ||
alignment != filter->preview_alignment || alignment != filter->preview_split_alignment ||
position != filter->preview_position) position != filter->preview_split_position)
{ {
gboolean old_enabled = filter->preview_enabled; gboolean old_enabled = filter->preview_split_enabled;
GimpAlignmentType old_alignment = filter->preview_alignment; GimpAlignmentType old_alignment = filter->preview_split_alignment;
gdouble old_position = filter->preview_position; gdouble old_position = filter->preview_split_position;
filter->preview_enabled = enabled; filter->preview_split_enabled = enabled;
filter->preview_alignment = alignment; filter->preview_split_alignment = alignment;
filter->preview_position = position; filter->preview_split_position = position;
gimp_drawable_filter_sync_crop (filter, gimp_drawable_filter_sync_crop (filter,
filter->crop_enabled, filter->crop_enabled,
@ -507,9 +508,9 @@ gimp_drawable_filter_commit (GimpDrawableFilter *filter,
format = gimp_applicator_get_output_format (filter->applicator); format = gimp_applicator_get_output_format (filter->applicator);
gimp_drawable_filter_set_preview (filter, FALSE, gimp_drawable_filter_set_preview_split (filter, FALSE,
filter->preview_alignment, filter->preview_split_alignment,
filter->preview_position); filter->preview_split_position);
success = gimp_drawable_merge_filter (filter->drawable, success = gimp_drawable_merge_filter (filter->drawable,
GIMP_FILTER (filter), GIMP_FILTER (filter),
@ -673,9 +674,9 @@ static gboolean
gimp_drawable_filter_get_crop_rect (GimpDrawableFilter *filter, gimp_drawable_filter_get_crop_rect (GimpDrawableFilter *filter,
gboolean crop_enabled, gboolean crop_enabled,
const GeglRectangle *crop_rect, const GeglRectangle *crop_rect,
gboolean preview_enabled, gboolean preview_split_enabled,
GimpAlignmentType preview_alignment, GimpAlignmentType preview_split_alignment,
gdouble preview_position, gdouble preview_split_position,
GeglRectangle *rect) GeglRectangle *rect)
{ {
GeglRectangle bounds; GeglRectangle bounds;
@ -695,24 +696,24 @@ gimp_drawable_filter_get_crop_rect (GimpDrawableFilter *filter,
y1 = bounds.y; y1 = bounds.y;
y2 = bounds.y + bounds.height; y2 = bounds.y + bounds.height;
if (preview_enabled) if (preview_split_enabled)
{ {
switch (preview_alignment) switch (preview_split_alignment)
{ {
case GIMP_ALIGN_LEFT: case GIMP_ALIGN_LEFT:
x2 = width * preview_position; x2 = width * preview_split_position;
break; break;
case GIMP_ALIGN_RIGHT: case GIMP_ALIGN_RIGHT:
x1 = width * preview_position; x1 = width * preview_split_position;
break; break;
case GIMP_ALIGN_TOP: case GIMP_ALIGN_TOP:
y2 = height * preview_position; y2 = height * preview_split_position;
break; break;
case GIMP_ALIGN_BOTTOM: case GIMP_ALIGN_BOTTOM:
y1 = height * preview_position; y1 = height * preview_split_position;
break; break;
default: default:
@ -732,9 +733,9 @@ static void
gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter, gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gboolean old_crop_enabled, gboolean old_crop_enabled,
const GeglRectangle *old_crop_rect, const GeglRectangle *old_crop_rect,
gboolean old_preview_enabled, gboolean old_preview_split_enabled,
GimpAlignmentType old_preview_alignment, GimpAlignmentType old_preview_split_alignment,
gdouble old_preview_position, gdouble old_preview_split_position,
gboolean update) gboolean update)
{ {
GeglRectangle old_rect; GeglRectangle old_rect;
@ -744,17 +745,17 @@ gimp_drawable_filter_sync_crop (GimpDrawableFilter *filter,
gimp_drawable_filter_get_crop_rect (filter, gimp_drawable_filter_get_crop_rect (filter,
old_crop_enabled, old_crop_enabled,
old_crop_rect, old_crop_rect,
old_preview_enabled, old_preview_split_enabled,
old_preview_alignment, old_preview_split_alignment,
old_preview_position, old_preview_split_position,
&old_rect); &old_rect);
enabled = gimp_drawable_filter_get_crop_rect (filter, enabled = gimp_drawable_filter_get_crop_rect (filter,
filter->crop_enabled, filter->crop_enabled,
&filter->crop_rect, &filter->crop_rect,
filter->preview_enabled, filter->preview_split_enabled,
filter->preview_alignment, filter->preview_split_alignment,
filter->preview_position, filter->preview_split_position,
&new_rect); &new_rect);
gimp_applicator_set_crop (filter->applicator, enabled ? &new_rect : NULL); gimp_applicator_set_crop (filter->applicator, enabled ? &new_rect : NULL);
@ -946,9 +947,9 @@ gimp_drawable_filter_add_filter (GimpDrawableFilter *filter)
gimp_drawable_filter_sync_crop (filter, gimp_drawable_filter_sync_crop (filter,
filter->crop_enabled, filter->crop_enabled,
&filter->crop_rect, &filter->crop_rect,
filter->preview_enabled, filter->preview_split_enabled,
filter->preview_alignment, filter->preview_split_alignment,
filter->preview_position, filter->preview_split_position,
TRUE); TRUE);
gimp_drawable_filter_sync_opacity (filter); gimp_drawable_filter_sync_opacity (filter);
gimp_drawable_filter_sync_mode (filter); gimp_drawable_filter_sync_mode (filter);
@ -1055,9 +1056,9 @@ gimp_drawable_filter_update_drawable (GimpDrawableFilter *filter,
gimp_drawable_filter_get_crop_rect (filter, gimp_drawable_filter_get_crop_rect (filter,
filter->crop_enabled, filter->crop_enabled,
&filter->crop_rect, &filter->crop_rect,
filter->preview_enabled, filter->preview_split_enabled,
filter->preview_alignment, filter->preview_split_alignment,
filter->preview_position, filter->preview_split_position,
&update_area); &update_area);
if (! gegl_rectangle_intersect (&update_area, if (! gegl_rectangle_intersect (&update_area,

3
app/core/gimpdrawablefilter.h
View File

@ -62,7 +62,8 @@ void gimp_drawable_filter_set_region (GimpDrawableFilter *filter,
void gimp_drawable_filter_set_crop (GimpDrawableFilter *filter, void gimp_drawable_filter_set_crop (GimpDrawableFilter *filter,
const GeglRectangle *rect, const GeglRectangle *rect,
gboolean update); gboolean update);
void gimp_drawable_filter_set_preview (GimpDrawableFilter *filter, void gimp_drawable_filter_set_preview_split
(GimpDrawableFilter *filter,
gboolean enabled, gboolean enabled,
GimpAlignmentType alignment, GimpAlignmentType alignment,
gdouble split_position); gdouble split_position);

38
app/tools/gimpfilteroptions.c
View File

@ -35,8 +35,8 @@ enum
PROP_0, PROP_0,
PROP_PREVIEW, PROP_PREVIEW,
PROP_PREVIEW_SPLIT, PROP_PREVIEW_SPLIT,
PROP_PREVIEW_ALIGNMENT, PROP_PREVIEW_SPLIT_ALIGNMENT,
PROP_PREVIEW_POSITION, PROP_PREVIEW_SPLIT_POSITION,
PROP_CONTROLLER, PROP_CONTROLLER,
PROP_CLIP, PROP_CLIP,
PROP_REGION, PROP_REGION,
@ -83,16 +83,16 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_PREVIEW_ALIGNMENT, g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_ALIGNMENT,
g_param_spec_enum ("preview-alignment", g_param_spec_enum ("preview-split-alignment",
NULL, NULL, NULL, NULL,
GIMP_TYPE_ALIGNMENT_TYPE, GIMP_TYPE_ALIGNMENT_TYPE,
GIMP_ALIGN_LEFT, GIMP_ALIGN_LEFT,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_PREVIEW_POSITION, g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_POSITION,
g_param_spec_double ("preview-position", g_param_spec_double ("preview-split-position",
NULL, NULL, NULL, NULL,
0.0, 1.0, 0.5, 0.0, 1.0, 0.5,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
@ -153,12 +153,12 @@ gimp_filter_options_set_property (GObject *object,
options->preview_split = g_value_get_boolean (value); options->preview_split = g_value_get_boolean (value);
break; break;
case PROP_PREVIEW_ALIGNMENT: case PROP_PREVIEW_SPLIT_ALIGNMENT:
options->preview_alignment = g_value_get_enum (value); options->preview_split_alignment = g_value_get_enum (value);
break; break;
case PROP_PREVIEW_POSITION: case PROP_PREVIEW_SPLIT_POSITION:
options->preview_position = g_value_get_double (value); options->preview_split_position = g_value_get_double (value);
break; break;
case PROP_CONTROLLER: case PROP_CONTROLLER:
@ -201,12 +201,12 @@ gimp_filter_options_get_property (GObject *object,
g_value_set_boolean (value, options->preview_split); g_value_set_boolean (value, options->preview_split);
break; break;
case PROP_PREVIEW_ALIGNMENT: case PROP_PREVIEW_SPLIT_ALIGNMENT:
g_value_set_enum (value, options->preview_alignment); g_value_set_enum (value, options->preview_split_alignment);
break; break;
case PROP_PREVIEW_POSITION: case PROP_PREVIEW_SPLIT_POSITION:
g_value_set_double (value, options->preview_position); g_value_set_double (value, options->preview_split_position);
break; break;
case PROP_CONTROLLER: case PROP_CONTROLLER:
@ -241,7 +241,7 @@ gimp_filter_options_switch_preview_side (GimpFilterOptions *options)
g_return_if_fail (GIMP_IS_FILTER_OPTIONS (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_LEFT: alignment = GIMP_ALIGN_RIGHT; break;
case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_LEFT; break; case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_LEFT; break;
@ -251,7 +251,7 @@ gimp_filter_options_switch_preview_side (GimpFilterOptions *options)
g_return_if_reached (); g_return_if_reached ();
} }
g_object_set (options, "preview-alignment", alignment, NULL); g_object_set (options, "preview-split-alignment", alignment, NULL);
} }
void void
@ -264,7 +264,7 @@ gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
g_return_if_fail (GIMP_IS_FILTER_OPTIONS (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_LEFT: alignment = GIMP_ALIGN_TOP; break;
case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_BOTTOM; break; case GIMP_ALIGN_RIGHT: alignment = GIMP_ALIGN_BOTTOM; break;
@ -285,7 +285,7 @@ gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
} }
g_object_set (options, g_object_set (options,
"preview-alignment", alignment, "preview-split-alignment", alignment,
"preview-position", CLAMP (position, 0.0, 1.0), "preview-split-position", CLAMP (position, 0.0, 1.0),
NULL); NULL);
} }

4
app/tools/gimpfilteroptions.h
View File

@ -38,8 +38,8 @@ struct _GimpFilterOptions
gboolean preview; gboolean preview;
gboolean preview_split; gboolean preview_split;
GimpAlignmentType preview_alignment; GimpAlignmentType preview_split_alignment;
gdouble preview_position; gdouble preview_split_position;
gboolean controller; gboolean controller;
GimpTransformResize clip; GimpTransformResize clip;
GimpFilterRegion region; GimpFilterRegion region;

39
app/tools/gimpfiltertool.c
View File

@ -749,8 +749,8 @@ gimp_filter_tool_options_notify (GimpTool *tool,
{ {
gdouble position; gdouble position;
if (filter_options->preview_alignment == GIMP_ALIGN_LEFT || if (filter_options->preview_split_alignment == GIMP_ALIGN_LEFT ||
filter_options->preview_alignment == GIMP_ALIGN_RIGHT) filter_options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{ {
position = ((gdouble) ((x + width / 2) - position = ((gdouble) ((x + width / 2) -
gimp_item_get_offset_x (item)) / gimp_item_get_offset_x (item)) /
@ -763,8 +763,9 @@ gimp_filter_tool_options_notify (GimpTool *tool,
(gdouble) gimp_item_get_height (item)); (gdouble) gimp_item_get_height (item));
} }
g_object_set (options, g_object_set (
"preview-position", CLAMP (position, 0.0, 1.0), options,
"preview-split-position", CLAMP (position, 0.0, 1.0),
NULL); NULL);
} }
} }
@ -776,8 +777,8 @@ gimp_filter_tool_options_notify (GimpTool *tool,
else else
gimp_filter_tool_remove_guide (filter_tool); gimp_filter_tool_remove_guide (filter_tool);
} }
else if (! strcmp (pspec->name, "preview-alignment") || else if (! strcmp (pspec->name, "preview-split-alignment") ||
! strcmp (pspec->name, "preview-position")) ! strcmp (pspec->name, "preview-split-position"))
{ {
gimp_filter_tool_update_filter (filter_tool); gimp_filter_tool_update_filter (filter_tool);
@ -1212,14 +1213,14 @@ gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
item = GIMP_ITEM (tool->drawable); item = GIMP_ITEM (tool->drawable);
image = gimp_item_get_image (item); image = gimp_item_get_image (item);
if (options->preview_alignment == GIMP_ALIGN_LEFT || if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
options->preview_alignment == GIMP_ALIGN_RIGHT) options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{ {
orientation = GIMP_ORIENTATION_VERTICAL; orientation = GIMP_ORIENTATION_VERTICAL;
position = (gimp_item_get_offset_x (item) + position = (gimp_item_get_offset_x (item) +
gimp_item_get_width (item) * gimp_item_get_width (item) *
options->preview_position); options->preview_split_position);
} }
else else
{ {
@ -1227,7 +1228,7 @@ gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
position = (gimp_item_get_offset_y (item) + position = (gimp_item_get_offset_y (item) +
gimp_item_get_height (item) * gimp_item_get_height (item) *
options->preview_position); options->preview_split_position);
} }
filter_tool->preview_guide = filter_tool->preview_guide =
@ -1273,14 +1274,14 @@ gimp_filter_tool_move_guide (GimpFilterTool *filter_tool)
item = GIMP_ITEM (tool->drawable); item = GIMP_ITEM (tool->drawable);
if (options->preview_alignment == GIMP_ALIGN_LEFT || if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
options->preview_alignment == GIMP_ALIGN_RIGHT) options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{ {
orientation = GIMP_ORIENTATION_VERTICAL; orientation = GIMP_ORIENTATION_VERTICAL;
position = (gimp_item_get_offset_x (item) + position = (gimp_item_get_offset_x (item) +
gimp_item_get_width (item) * gimp_item_get_width (item) *
options->preview_position); options->preview_split_position);
} }
else else
{ {
@ -1288,7 +1289,7 @@ gimp_filter_tool_move_guide (GimpFilterTool *filter_tool)
position = (gimp_item_get_offset_y (item) + position = (gimp_item_get_offset_y (item) +
gimp_item_get_height (item) * gimp_item_get_height (item) *
options->preview_position); options->preview_split_position);
} }
if (orientation != gimp_guide_get_orientation (filter_tool->preview_guide) || if (orientation != gimp_guide_get_orientation (filter_tool->preview_guide) ||
@ -1330,8 +1331,8 @@ gimp_filter_tool_guide_moved (GimpGuide *guide,
GimpItem *item = GIMP_ITEM (tool->drawable); GimpItem *item = GIMP_ITEM (tool->drawable);
gdouble position; gdouble position;
if (options->preview_alignment == GIMP_ALIGN_LEFT || if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
options->preview_alignment == GIMP_ALIGN_RIGHT) options->preview_split_alignment == GIMP_ALIGN_RIGHT)
{ {
position = ((gdouble) (gimp_guide_get_position (guide) - position = ((gdouble) (gimp_guide_get_position (guide) -
gimp_item_get_offset_x (item)) / gimp_item_get_offset_x (item)) /
@ -1345,7 +1346,7 @@ gimp_filter_tool_guide_moved (GimpGuide *guide,
} }
g_object_set (options, g_object_set (options,
"preview-position", CLAMP (position, 0.0, 1.0), "preview-split-position", CLAMP (position, 0.0, 1.0),
NULL); NULL);
} }
@ -1393,7 +1394,7 @@ gimp_filter_tool_update_filter (GimpFilterTool *filter_tool)
clip); clip);
gimp_drawable_filter_set_region (filter_tool->filter, gimp_drawable_filter_set_region (filter_tool->filter,
options->region); options->region);
gimp_drawable_filter_set_preview (filter_tool->filter, gimp_drawable_filter_set_preview_split (filter_tool->filter,
options->preview_split, options->preview_split,
options->preview_alignment, options->preview_alignment,
options->preview_position); options->preview_position);
@ -1565,7 +1566,7 @@ gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
g_object_set (GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool), g_object_set (GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool),
"preview-split", FALSE, "preview-split", FALSE,
"preview-position", 0.5, "preview-split-position", 0.5,
NULL); NULL);
g_signal_connect_object (filter_tool->config, "notify", g_signal_connect_object (filter_tool->config, "notify",