From 93f728e484eddb461730bc8084c86a6d4ce79942 Mon Sep 17 00:00:00 2001 From: Ell Date: Thu, 11 Jun 2020 21:29:12 +0300 Subject: [PATCH] app: fix switching filter-tool split-preview orientation ... after last commit. --- app/tools/gimpfilteroptions.c | 8 ++++---- app/tools/gimpfilteroptions.h | 4 ++-- app/tools/gimpfiltertool.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c index 2a8f5cd020..37de75f49a 100644 --- a/app/tools/gimpfilteroptions.c +++ b/app/tools/gimpfilteroptions.c @@ -235,11 +235,11 @@ gimp_filter_options_switch_preview_side (GimpFilterOptions *options) void gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options, - gdouble position_x, - gdouble position_y) + gint position_x, + gint position_y) { GimpAlignmentType alignment; - gdouble position; + gint position; g_return_if_fail (GIMP_IS_FILTER_OPTIONS (options)); @@ -265,6 +265,6 @@ gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options, g_object_set (options, "preview-split-alignment", alignment, - "preview-split-position", CLAMP (position, 0.0, 1.0), + "preview-split-position", position, NULL); } diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h index 5ae9192ae1..7cd3b5fa26 100644 --- a/app/tools/gimpfilteroptions.h +++ b/app/tools/gimpfilteroptions.h @@ -56,8 +56,8 @@ GType gimp_filter_options_get_type (void) G_GNUC_CONST; void gimp_filter_options_switch_preview_side (GimpFilterOptions *options); void gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options, - gdouble position_x, - gdouble position_y); + gint position_x, + gint position_y); #endif /* __GIMP_FILTER_OPTIONS_H__ */ diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c index 9c7a7bfde5..b5b576aa88 100644 --- a/app/tools/gimpfiltertool.c +++ b/app/tools/gimpfiltertool.c @@ -505,13 +505,13 @@ gimp_filter_tool_button_press (GimpTool *tool, else if (state & gimp_get_toggle_behavior_mask ()) { GimpItem *item = GIMP_ITEM (tool->drawables->data); - gdouble pos_x; - gdouble pos_y; + gint pos_x; + gint pos_y; - pos_x = ((coords->x - gimp_item_get_offset_x (item)) / - gimp_item_get_width (item)); - pos_y = ((coords->y - gimp_item_get_offset_y (item)) / - gimp_item_get_height (item)); + pos_x = CLAMP (RINT (coords->x) - gimp_item_get_offset_x (item), + 0, gimp_item_get_width (item)); + pos_y = CLAMP (RINT (coords->y) - gimp_item_get_offset_y (item), + 0, gimp_item_get_height (item)); gimp_filter_options_switch_preview_orientation (options, pos_x, pos_y);