dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: bye bye to 1534 lines of code in GimpVectorTool, use a GimpToolPath

This commit is contained in:
Michael Natterer 2017-06-21 23:28:07 +02:00
parent 3ab92c7290
commit 8b36164a2a
2 changed files with 274 additions and 1495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1718
app/tools/gimpvectortool.c
View File

File diff suppressed because it is too large Load Diff

51
app/tools/gimpvectortool.h
View File

@ -25,28 +25,6 @@
#include "gimpdrawtool.h"
/* possible vector functions */
typedef enum
{
VECTORS_SELECT_VECTOR,
VECTORS_CREATE_VECTOR,
VECTORS_CREATE_STROKE,
VECTORS_ADD_ANCHOR,
VECTORS_MOVE_ANCHOR,
VECTORS_MOVE_ANCHORSET,
VECTORS_MOVE_HANDLE,
VECTORS_MOVE_CURVE,
VECTORS_MOVE_STROKE,
VECTORS_MOVE_VECTORS,
VECTORS_INSERT_ANCHOR,
VECTORS_DELETE_ANCHOR,
VECTORS_CONNECT_STROKES,
VECTORS_DELETE_SEGMENT,
VECTORS_CONVERT_EDGE,
VECTORS_FINISHED
} GimpVectorFunction;
#define GIMP_TYPE_VECTOR_TOOL (gimp_vector_tool_get_type ())
#define GIMP_VECTOR_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTOR_TOOL, GimpVectorTool))
#define GIMP_VECTOR_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTOR_TOOL, GimpVectorToolClass))
@ -62,32 +40,13 @@ typedef struct _GimpVectorToolClass GimpVectorToolClass;
struct _GimpVectorTool
{
GimpDrawTool parent_instance;
GimpDrawTool parent_instance;
GimpVectorFunction function; /* function we're performing */
GimpAnchorFeatureType restriction; /* movement restriction */
gboolean modifier_lock; /* can we toggle the Shift key? */
GdkModifierType saved_state; /* modifier state at button_press */
gdouble last_x; /* last x coordinate */
gdouble last_y; /* last y coordinate */
gboolean undo_motion; /* we need a motion to have an undo */
gboolean have_undo; /* did we push an undo at */
/* ..._button_press? */
GimpVectors *vectors; /* the current Vector data */
GimpVectorMode saved_mode; /* used by modifier_key() */
GimpAnchor *cur_anchor; /* the current Anchor */
GimpAnchor *cur_anchor2; /* secondary Anchor (end on_curve) */
GimpStroke *cur_stroke; /* the current Stroke */
gdouble cur_position; /* the current Position on a segment */
GimpVectors *cur_vectors; /* the vectors the tool is hovering */
/* over (if different from ->vectors */
GimpVectors *vectors; /* the current Vector data */
gint sel_count; /* number of selected anchors */
GimpAnchor *sel_anchor; /* currently selected anchor, NULL */
/* if multiple anchors are selected */
GimpStroke *sel_stroke; /* selected stroke */
GimpVectorMode saved_mode; /* used by modifier_key() */
GimpToolWidget *path;
GimpToolWidget *grab_widget;
};
struct _GimpVectorToolClass