[gimp] app: small style cleanup in the merged cage code
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: small style cleanup in the merged cage code
- Date: Wed, 23 Mar 2011 21:29:24 +0000 (UTC)
commit 1659f62e2c79b6026f80911624359cd818b32ac5
Author: Michael Natterer <mitch gimp org>
Date: Wed Mar 23 22:29:00 2011 +0100
app: small style cleanup in the merged cage code
app/gegl/gimpcageconfig.c | 71 +++++----
app/gegl/gimpcageconfig.h | 1 +
app/gegl/gimpoperationcagetransform.c | 4 +-
app/tools/gimpcagetool.c | 295 +++++++++++++++++++--------------
4 files changed, 215 insertions(+), 156 deletions(-)
---
diff --git a/app/gegl/gimpcageconfig.c b/app/gegl/gimpcageconfig.c
index 438317c..ce91c76 100644
--- a/app/gegl/gimpcageconfig.c
+++ b/app/gegl/gimpcageconfig.c
@@ -21,12 +21,12 @@
#include <gegl.h>
-#include "gimp-gegl-types.h"
-
#include "libgimpconfig/gimpconfig.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h"
+#include "gimp-gegl-types.h"
+
#include "gimpcageconfig.h"
@@ -52,6 +52,7 @@ static void gimp_cage_config_set_property (GObject *object,
static void gimp_cage_config_compute_scaling_factor (GimpCageConfig *gcc);
static void gimp_cage_config_compute_edges_normal (GimpCageConfig *gcc);
+
G_DEFINE_TYPE_WITH_CODE (GimpCageConfig, gimp_cage_config,
GIMP_TYPE_IMAGE_MAP_CONFIG,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
@@ -59,31 +60,34 @@ G_DEFINE_TYPE_WITH_CODE (GimpCageConfig, gimp_cage_config,
#define parent_class gimp_cage_config_parent_class
+
#ifdef DEBUG_CAGE
static void
print_cage (GimpCageConfig *gcc)
{
gint i;
GeglRectangle bounding_box;
+
g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
bounding_box = gimp_cage_config_get_bounding_box (gcc);
for (i = 0; i < gcc->n_cage_vertices; i++)
{
- printf("cgx: %.0f cgy: %.0f cvdx: %.0f cvdy: %.0f sf: %.2f normx: %.2f normy: %.2f %s\n",
- gcc->cage_points[i].src_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_x:0),
- gcc->cage_points[i].src_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_y:0),
- gcc->cage_points[i].dest_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_x:0),
- gcc->cage_points[i].dest_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_y:0),
- gcc->cage_points[i].edge_scaling_factor,
- gcc->cage_points[i].edge_normal.x,
- gcc->cage_points[i].edge_normal.y,
- ((gcc->cage_points[i].selected) ? "S" : "NS"));
+ g_printerr ("cgx: %.0f cgy: %.0f cvdx: %.0f cvdy: %.0f sf: %.2f normx: %.2f normy: %.2f %s\n",
+ gcc->cage_points[i].src_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_x:0),
+ gcc->cage_points[i].src_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_y:0),
+ gcc->cage_points[i].dest_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_x:0),
+ gcc->cage_points[i].dest_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_y:0),
+ gcc->cage_points[i].edge_scaling_factor,
+ gcc->cage_points[i].edge_normal.x,
+ gcc->cage_points[i].edge_normal.y,
+ ((gcc->cage_points[i].selected) ? "S" : "NS"));
}
- printf("bounding box: x: %d y: %d width: %d height: %d\n", bounding_box.x, bounding_box.y, bounding_box.width, bounding_box.height);
- printf("disp x: %f disp y: %f\n", gcc->displacement_x, gcc->displacement_y);
- printf("done\n");
+
+ g_printerr ("bounding box: x: %d y: %d width: %d height: %d\n", bounding_box.x, bounding_box.y, bounding_box.width, bounding_box.height);
+ g_printerr ("disp x: %f disp y: %f\n", gcc->displacement_x, gcc->displacement_y);
+ g_printerr ("done\n");
}
#endif
@@ -110,7 +114,7 @@ gimp_cage_config_init (GimpCageConfig *self)
static void
gimp_cage_config_finalize (GObject *object)
{
- GimpCageConfig *gcc = GIMP_CAGE_CONFIG (object);
+ GimpCageConfig *gcc = GIMP_CAGE_CONFIG (object);
g_free (gcc->cage_points);
@@ -210,11 +214,11 @@ gimp_cage_config_remove_last_cage_point (GimpCageConfig *gcc)
* Returns: the real position of the given point, as a GimpVector2
*/
GimpVector2
-gimp_cage_config_get_point_coordinate (GimpCageConfig *gcc,
- GimpCageMode mode,
- gint point_number)
+gimp_cage_config_get_point_coordinate (GimpCageConfig *gcc,
+ GimpCageMode mode,
+ gint point_number)
{
- GimpVector2 point = {0.0, 0.0};
+ GimpVector2 point = { 0.0, 0.0 };
g_return_val_if_fail (GIMP_IS_CAGE_CONFIG (gcc), point);
g_return_val_if_fail (point_number < gcc->n_cage_vertices, point);
@@ -262,10 +266,10 @@ gimp_cage_config_get_point_coordinate (GimpCageConfig *gcc,
* This displacement need to be commited to become effective.
*/
void
-gimp_cage_config_add_displacement (GimpCageConfig *gcc,
- GimpCageMode mode,
- gdouble x,
- gdouble y)
+gimp_cage_config_add_displacement (GimpCageConfig *gcc,
+ GimpCageMode mode,
+ gdouble x,
+ gdouble y)
{
g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
@@ -285,7 +289,7 @@ gimp_cage_config_add_displacement (GimpCageConfig *gcc,
* Apply the displacement to the cage
*/
void
-gimp_cage_config_commit_displacement (GimpCageConfig *gcc)
+gimp_cage_config_commit_displacement (GimpCageConfig *gcc)
{
gint i;
@@ -309,6 +313,7 @@ gimp_cage_config_commit_displacement (GimpCageConfig *gcc)
}
}
}
+
gimp_cage_config_compute_scaling_factor (gcc);
gimp_cage_config_compute_edges_normal (gcc);
gimp_cage_config_reset_displacement (gcc);
@@ -321,7 +326,7 @@ gimp_cage_config_commit_displacement (GimpCageConfig *gcc)
* Set the displacement to zero.
*/
void
-gimp_cage_config_reset_displacement (GimpCageConfig *gcc)
+gimp_cage_config_reset_displacement (GimpCageConfig *gcc)
{
g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
@@ -338,7 +343,7 @@ gimp_cage_config_reset_displacement (GimpCageConfig *gcc)
* Returns: the bounding box of the source cage, as a GeglRectangle
*/
GeglRectangle
-gimp_cage_config_get_bounding_box (GimpCageConfig *gcc)
+gimp_cage_config_get_bounding_box (GimpCageConfig *gcc)
{
GeglRectangle bounding_box = { 0, };
gint i;
@@ -629,9 +634,9 @@ gimp_cage_config_select_area (GimpCageConfig *gcc,
* Select cage's point inside the given area. Already selected point stay selected.
*/
void
-gimp_cage_config_select_add_area (GimpCageConfig *gcc,
- GimpCageMode mode,
- GeglRectangle area)
+gimp_cage_config_select_add_area (GimpCageConfig *gcc,
+ GimpCageMode mode,
+ GeglRectangle area)
{
gint i;
@@ -670,8 +675,8 @@ gimp_cage_config_select_add_area (GimpCageConfig *gcc,
* Toggle the selection of the given cage point
*/
void
-gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
- gint point_number)
+gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
+ gint point_number)
{
g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
g_return_if_fail (point_number < gcc->n_cage_vertices);
@@ -687,7 +692,7 @@ gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
* Deselect all cage points.
*/
void
-gimp_cage_config_deselect_points (GimpCageConfig *gcc)
+gimp_cage_config_deselect_points (GimpCageConfig *gcc)
{
gint i;
@@ -697,4 +702,4 @@ gimp_cage_config_deselect_points (GimpCageConfig *gcc)
{
gcc->cage_points[i].selected = FALSE;
}
-}
\ No newline at end of file
+}
diff --git a/app/gegl/gimpcageconfig.h b/app/gegl/gimpcageconfig.h
index 42812c9..5f4be0c 100644
--- a/app/gegl/gimpcageconfig.h
+++ b/app/gegl/gimpcageconfig.h
@@ -86,4 +86,5 @@ void gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
gint point_number);
void gimp_cage_config_deselect_points (GimpCageConfig *gcc);
+
#endif /* __GIMP_CAGE_CONFIG_H__ */
diff --git a/app/gegl/gimpoperationcagetransform.c b/app/gegl/gimpoperationcagetransform.c
index 2bcff13..a3c45ce 100644
--- a/app/gegl/gimpoperationcagetransform.c
+++ b/app/gegl/gimpoperationcagetransform.c
@@ -128,7 +128,7 @@ gimp_operation_cage_transform_init (GimpOperationCageTransform *self)
}
static void
-gimp_operation_cage_transform_finalize (GObject *object)
+gimp_operation_cage_transform_finalize (GObject *object)
{
GimpOperationCageTransform *self = GIMP_OPERATION_CAGE_TRANSFORM (object);
@@ -190,7 +190,7 @@ gimp_operation_cage_transform_set_property (GObject *object,
}
static void
-gimp_operation_cage_transform_prepare (GeglOperation *operation)
+gimp_operation_cage_transform_prepare (GeglOperation *operation)
{
GimpOperationCageTransform *oct = GIMP_OPERATION_CAGE_TRANSFORM (operation);
GimpCageConfig *config = GIMP_CAGE_CONFIG (oct->config);
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
index 262fecf..a69e278 100644
--- a/app/tools/gimpcagetool.c
+++ b/app/tools/gimpcagetool.c
@@ -61,6 +61,19 @@
#include "gimp-intl.h"
+enum
+{
+ CAGE_STATE_INIT,
+ CAGE_STATE_WAIT,
+ CAGE_STATE_MOVE_HANDLE,
+ CAGE_STATE_SELECTING,
+ CAGE_STATE_CLOSING,
+ DEFORM_STATE_WAIT,
+ DEFORM_STATE_MOVE_HANDLE,
+ DEFORM_STATE_SELECTING
+};
+
+
static void gimp_cage_tool_finalize (GObject *object);
static void gimp_cage_tool_start (GimpCageTool *ct,
GimpDisplay *display);
@@ -122,21 +135,11 @@ static void gimp_cage_tool_image_map_update (GimpCageTool *ct);
static void gimp_cage_tool_create_render_node (GimpCageTool *ct);
static void gimp_cage_tool_render_node_update (GimpCageTool *ct);
+
G_DEFINE_TYPE (GimpCageTool, gimp_cage_tool, GIMP_TYPE_DRAW_TOOL)
#define parent_class gimp_cage_tool_parent_class
-enum
-{
- CAGE_STATE_INIT,
- CAGE_STATE_WAIT,
- CAGE_STATE_MOVE_HANDLE,
- CAGE_STATE_SELECTING,
- CAGE_STATE_CLOSING,
- DEFORM_STATE_WAIT,
- DEFORM_STATE_MOVE_HANDLE,
- DEFORM_STATE_SELECTING
-};
void
gimp_cage_tool_register (GimpToolRegisterCallback callback,
@@ -313,12 +316,14 @@ gimp_cage_tool_options_notify (GimpTool *tool,
NULL);
if (mode == GIMP_CAGE_MODE_DEFORM)
- /* switch to deform mode */
{
+ /* switch to deform mode */
+
ct->cage_complete = TRUE;
gimp_cage_config_reset_displacement (ct->config);
gimp_cage_config_reverse_cage_if_needed (ct->config);
- gimp_tool_push_status (tool, tool->display, _("Press ENTER to commit the transform"));
+ gimp_tool_push_status (tool, tool->display,
+ _("Press ENTER to commit the transform"));
ct->tool_state = DEFORM_STATE_WAIT;
if (ct->dirty_coef)
@@ -335,14 +340,16 @@ gimp_cage_tool_options_notify (GimpTool *tool,
{
GimpImage *image = gimp_display_get_image (tool->display);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
gimp_cage_tool_create_image_map (ct, drawable);
}
gimp_cage_tool_image_map_update (ct);
}
else
- /* switch to edit mode */
{
+ /* switch to edit mode */
+
gimp_image_map_clear (ct->image_map);
gimp_image_flush (gimp_display_get_image (tool->display));
gimp_tool_pop_status (tool, tool->display);
@@ -419,14 +426,14 @@ gimp_cage_tool_motion (GimpTool *tool,
switch (ct->tool_state)
{
- case CAGE_STATE_MOVE_HANDLE:
- case CAGE_STATE_CLOSING:
- case DEFORM_STATE_MOVE_HANDLE:
- gimp_cage_config_add_displacement (ct->config,
- options->cage_mode,
- ct->cursor_x - ct->movement_start_x,
- ct->cursor_y - ct->movement_start_y);
- break;
+ case CAGE_STATE_MOVE_HANDLE:
+ case CAGE_STATE_CLOSING:
+ case DEFORM_STATE_MOVE_HANDLE:
+ gimp_cage_config_add_displacement (ct->config,
+ options->cage_mode,
+ ct->cursor_x - ct->movement_start_x,
+ ct->cursor_y - ct->movement_start_y);
+ break;
}
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
@@ -489,7 +496,9 @@ gimp_cage_tool_button_press (GimpTool *tool,
switch (ct->tool_state)
{
case CAGE_STATE_INIT:
- /* No handle yet, we add the first one and swith the tool to moving handle state. */
+ /* No handle yet, we add the first one and swith the tool to
+ * moving handle state.
+ */
gimp_cage_config_add_cage_point (ct->config,
coords->x - ct->offset_x,
coords->y - ct->offset_y);
@@ -501,64 +510,84 @@ gimp_cage_tool_button_press (GimpTool *tool,
if (ct->cage_complete == FALSE)
{
if (handle == -1)
- /* User clicked on the background, we add a new handle and move it */
{
+ /* User clicked on the background, we add a new handle
+ * and move it
+ */
gimp_cage_config_add_cage_point (ct->config,
coords->x - ct->offset_x,
coords->y - ct->offset_y);
gimp_cage_config_select_point (ct->config, ct->config->n_cage_vertices - 1);
ct->tool_state = CAGE_STATE_MOVE_HANDLE;
}
+
if (handle == 0 && ct->config->n_cage_vertices > 2)
- /* User clicked on the first handle, we wait for release for closing the cage and switching to deform if possible */
{
+ /* User clicked on the first handle, we wait for
+ * release for closing the cage and switching to
+ * deform if possible
+ */
gimp_cage_config_select_point (ct->config, 0);
ct->tool_state = CAGE_STATE_CLOSING;
}
+
if (handle > 0)
- /* User clicked on a handle, so we move it */
{
+ /* User clicked on a handle, so we move it */
+
if (state & GDK_SHIFT_MASK)
- /* Multiple selection */
{
+ /* Multiple selection */
+
gimp_cage_config_toggle_point_selection (ct->config, handle);
}
else
- /* New selection */
{
+ /* New selection */
+
if (! ct->config->cage_points[handle].selected)
{
gimp_cage_config_select_point (ct->config, handle);
}
}
+
ct->tool_state = CAGE_STATE_MOVE_HANDLE;
}
}
- else /* Cage already closed */
+ else
{
+ /* Cage already closed */
+
if (handle == -1)
- /* User clicked on the background, we start a rubber band selection */
{
+ /* User clicked on the background, we start a rubber
+ * band selection
+ */
ct->selection_start_x = coords->x;
ct->selection_start_y = coords->y;
ct->tool_state = CAGE_STATE_SELECTING;
}
+
if (handle >= 0)
- /* User clicked on a handle, so we move it */
{
+ /* User clicked on a handle, so we move it */
+
if (state & GDK_SHIFT_MASK)
- /* Multiple selection */
{
+ /* Multiple selection */
+
gimp_cage_config_toggle_point_selection (ct->config, handle);
}
else
- /* New selection */
{
+ /* New selection */
+
if (! ct->config->cage_points[handle].selected)
{
gimp_cage_config_select_point (ct->config, handle);
}
}
+
ct->tool_state = CAGE_STATE_MOVE_HANDLE;
}
}
@@ -566,28 +595,35 @@ gimp_cage_tool_button_press (GimpTool *tool,
case DEFORM_STATE_WAIT:
if (handle == -1)
- /* User clicked on the background, we start a rubber band selection */
{
+ /* User clicked on the background, we start a rubber band
+ * selection
+ */
ct->selection_start_x = coords->x;
ct->selection_start_y = coords->y;
ct->tool_state = DEFORM_STATE_SELECTING;
}
+
if (handle >= 0)
- /* User clicked on a handle, so we move it */
{
+ /* User clicked on a handle, so we move it */
+
if (state & GDK_SHIFT_MASK)
- /* Multiple selection */
{
+ /* Multiple selection */
+
gimp_cage_config_toggle_point_selection (ct->config, handle);
}
else
- /* New selection */
{
+ /* New selection */
+
if (! ct->config->cage_points[handle].selected)
{
gimp_cage_config_select_point (ct->config, handle);
}
}
+
ct->tool_state = DEFORM_STATE_MOVE_HANDLE;
}
break;
@@ -608,94 +644,105 @@ gimp_cage_tool_button_release (GimpTool *tool,
gimp_draw_tool_pause (GIMP_DRAW_TOOL (ct));
if (state & GDK_BUTTON3_MASK)
- /* Cancelling */
{
- switch(ct->tool_state)
+ /* Cancelling */
+
+ switch (ct->tool_state)
{
- case CAGE_STATE_CLOSING:
- ct->tool_state = CAGE_STATE_WAIT;
- break;
+ case CAGE_STATE_CLOSING:
+ ct->tool_state = CAGE_STATE_WAIT;
+ break;
- case CAGE_STATE_MOVE_HANDLE:
- gimp_cage_config_remove_last_cage_point (ct->config);
- ct->tool_state = CAGE_STATE_WAIT;
- break;
+ case CAGE_STATE_MOVE_HANDLE:
+ gimp_cage_config_remove_last_cage_point (ct->config);
+ ct->tool_state = CAGE_STATE_WAIT;
+ break;
- case CAGE_STATE_SELECTING:
- ct->tool_state = CAGE_STATE_WAIT;
- break;
+ case CAGE_STATE_SELECTING:
+ ct->tool_state = CAGE_STATE_WAIT;
+ break;
- case DEFORM_STATE_MOVE_HANDLE:
- gimp_cage_tool_image_map_update (ct);
- ct->tool_state = DEFORM_STATE_WAIT;
- break;
+ case DEFORM_STATE_MOVE_HANDLE:
+ gimp_cage_tool_image_map_update (ct);
+ ct->tool_state = DEFORM_STATE_WAIT;
+ break;
- case DEFORM_STATE_SELECTING:
- ct->tool_state = DEFORM_STATE_WAIT;
- break;
+ case DEFORM_STATE_SELECTING:
+ ct->tool_state = DEFORM_STATE_WAIT;
+ break;
}
+
gimp_cage_config_reset_displacement (ct->config);
}
else
- /* Normal release */
{
- switch(ct->tool_state)
+ /* Normal release */
+
+ switch (ct->tool_state)
{
- case CAGE_STATE_CLOSING:
- ct->dirty_coef = TRUE;
- gimp_cage_config_commit_displacement (ct->config);
- g_object_set (options, "cage-mode", GIMP_CAGE_MODE_DEFORM, NULL);
- break;
-
- case CAGE_STATE_MOVE_HANDLE:
- ct->dirty_coef = TRUE;
- ct->tool_state = CAGE_STATE_WAIT;
- gimp_cage_config_commit_displacement (ct->config);
- break;
+ case CAGE_STATE_CLOSING:
+ ct->dirty_coef = TRUE;
+ gimp_cage_config_commit_displacement (ct->config);
+ g_object_set (options, "cage-mode", GIMP_CAGE_MODE_DEFORM, NULL);
+ break;
+
+ case CAGE_STATE_MOVE_HANDLE:
+ ct->dirty_coef = TRUE;
+ ct->tool_state = CAGE_STATE_WAIT;
+ gimp_cage_config_commit_displacement (ct->config);
+ break;
- case CAGE_STATE_SELECTING:
- {
- GeglRectangle area = {MIN(ct->selection_start_x, coords->x) - ct->offset_x,
- MIN(ct->selection_start_y, coords->y) - ct->offset_y,
- abs (ct->selection_start_x - coords->x),
- abs (ct->selection_start_y - coords->y)};
+ case CAGE_STATE_SELECTING:
+ {
+ GeglRectangle area = { MIN (ct->selection_start_x, coords->x) - ct->offset_x,
+ MIN (ct->selection_start_y, coords->y) - ct->offset_y,
+ abs (ct->selection_start_x - coords->x),
+ abs (ct->selection_start_y - coords->y) };
- if (state & GDK_SHIFT_MASK)
- {
- gimp_cage_config_select_add_area (ct->config, GIMP_CAGE_MODE_CAGE_CHANGE, area);
- }
- else
- {
- gimp_cage_config_select_area (ct->config, GIMP_CAGE_MODE_CAGE_CHANGE, area);
- }
- ct->tool_state = CAGE_STATE_WAIT;
+ if (state & GDK_SHIFT_MASK)
+ {
+ gimp_cage_config_select_add_area (ct->config,
+ GIMP_CAGE_MODE_CAGE_CHANGE,
+ area);
+ }
+ else
+ {
+ gimp_cage_config_select_area (ct->config,
+ GIMP_CAGE_MODE_CAGE_CHANGE,
+ area);
}
- break;
- case DEFORM_STATE_MOVE_HANDLE:
- ct->tool_state = DEFORM_STATE_WAIT;
- gimp_cage_config_commit_displacement (ct->config);
- gimp_cage_tool_image_map_update (ct);
- break;
+ ct->tool_state = CAGE_STATE_WAIT;
+ }
+ break;
- case DEFORM_STATE_SELECTING:
- {
- GeglRectangle area = {MIN(ct->selection_start_x, coords->x) - ct->offset_x,
- MIN(ct->selection_start_y, coords->y) - ct->offset_y,
- abs (ct->selection_start_x - coords->x),
- abs (ct->selection_start_y - coords->y)};
+ case DEFORM_STATE_MOVE_HANDLE:
+ ct->tool_state = DEFORM_STATE_WAIT;
+ gimp_cage_config_commit_displacement (ct->config);
+ gimp_cage_tool_image_map_update (ct);
+ break;
- if (state & GDK_SHIFT_MASK)
- {
- gimp_cage_config_select_add_area (ct->config, GIMP_CAGE_MODE_DEFORM, area);
- }
- else
- {
- gimp_cage_config_select_area (ct->config, GIMP_CAGE_MODE_DEFORM, area);
- }
- ct->tool_state = DEFORM_STATE_WAIT;
+ case DEFORM_STATE_SELECTING:
+ {
+ GeglRectangle area = { MIN (ct->selection_start_x, coords->x) - ct->offset_x,
+ MIN (ct->selection_start_y, coords->y) - ct->offset_y,
+ abs (ct->selection_start_x - coords->x),
+ abs (ct->selection_start_y - coords->y) };
+
+ if (state & GDK_SHIFT_MASK)
+ {
+ gimp_cage_config_select_add_area (ct->config,
+ GIMP_CAGE_MODE_DEFORM, area);
}
- break;
+ else
+ {
+ gimp_cage_config_select_area (ct->config,
+ GIMP_CAGE_MODE_DEFORM, area);
+ }
+
+ ct->tool_state = DEFORM_STATE_WAIT;
+ }
+ break;
}
}
@@ -750,9 +797,14 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool)
gimp_draw_tool_push_group (draw_tool, stroke_group);
/* If needed, draw ligne to the cursor. */
- if (!ct->cage_complete)
+ if (! ct->cage_complete)
{
- GimpVector2 last_point = gimp_cage_config_get_point_coordinate (ct->config, GIMP_CAGE_MODE_CAGE_CHANGE, n_vertices - 1);
+ GimpVector2 last_point;
+
+ last_point = gimp_cage_config_get_point_coordinate (ct->config,
+ GIMP_CAGE_MODE_CAGE_CHANGE,
+ n_vertices - 1);
+
gimp_draw_tool_add_line (draw_tool,
last_point.x + ct->offset_x,
last_point.y + ct->offset_y,
@@ -775,7 +827,7 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool)
if (i > 0 || ct->cage_complete)
{
- gint index_point2;
+ gint index_point2;
if (i == 0)
index_point2 = n_vertices - 1;
@@ -824,28 +876,29 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool)
}
}
- if (ct->tool_state == DEFORM_STATE_SELECTING || ct->tool_state == CAGE_STATE_SELECTING)
+ if (ct->tool_state == DEFORM_STATE_SELECTING ||
+ ct->tool_state == CAGE_STATE_SELECTING)
{
gimp_draw_tool_add_rectangle (draw_tool,
FALSE,
- MIN(ct->selection_start_x, ct->cursor_x),
- MIN(ct->selection_start_y, ct->cursor_y),
+ MIN (ct->selection_start_x, ct->cursor_x),
+ MIN (ct->selection_start_y, ct->cursor_y),
abs (ct->selection_start_x - ct->cursor_x),
abs (ct->selection_start_y - ct->cursor_y));
}
}
static gint
-gimp_cage_tool_is_on_handle (GimpCageTool *ct,
- GimpDrawTool *draw_tool,
- GimpDisplay *display,
- gdouble x,
- gdouble y,
- gint handle_size)
+gimp_cage_tool_is_on_handle (GimpCageTool *ct,
+ GimpDrawTool *draw_tool,
+ GimpDisplay *display,
+ gdouble x,
+ gdouble y,
+ gint handle_size)
{
- GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
- GimpCageConfig *config = ct->config;
- gdouble dist = G_MAXDOUBLE;
+ GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+ GimpCageConfig *config = ct->config;
+ gdouble dist = G_MAXDOUBLE;
gint i;
GimpVector2 cage_point;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
