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

Fix for #85201: 

2002-06-16  Michael Natterer  <mitch@gimp.org>

	Fix for #85201:

	* app/tools/gimpfliptool.c: set the toggle_cursor correctly.

	* app/tools/gimptransformtool.c: if "use_grid" is FALSE, skip the
	cursor update stuff and chain up directly.

	Misc tool->control options fixes:

	* app/tools/gimppainttool.c: set "motion_mode" to
	GIMP_MOTION_MODE_EXACT.

	* app/tools/gimpairbrushtool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpdodgeburntool.c
	* app/tools/gimperasertool.c
	* app/tools/gimppaintbrushtool.c
	* app/tools/gimpsmudgetool.c: don't touch "motion_mode" here.

	* app/tools/gimpimagemaptool.c
	* app/tools/gimptransformtool.c: set "scroll_lock" to TRUE and
	"preserve" to FALSE.

	* app/tools/gimpcurvestool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpfliptool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c: don't touch them here.

	* app/tools/gimphistogramtool.[ch]: derive it from GimpImageMapTool
	so it inherits it's control settings.

	* app/tools/gimpellipseselecttool.c: don't set "preserve" to TRUE.

	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmovetool.c: code formating paranoia.

	* app/tools/gimptoolcontrol.c: fixed indentation.
This commit is contained in:
Michael Natterer 2002-06-16 17:13:39 +00:00 committed by Michael Natterer
parent 6fe42e3691
commit aa7be287dc
29 changed files with 242 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ChangeLog
View File

@ -1,3 +1,48 @@
2002-06-16 Michael Natterer <mitch@gimp.org>
Fix for #85201:
* app/tools/gimpfliptool.c: set the toggle_cursor correctly.
* app/tools/gimptransformtool.c: if "use_grid" is FALSE, skip the
cursor update stuff and chain up directly.
Misc tool->control options fixes:
* app/tools/gimppainttool.c: set "motion_mode" to
GIMP_MOTION_MODE_EXACT.
* app/tools/gimpairbrushtool.c
* app/tools/gimpclonetool.c
* app/tools/gimpconvolvetool.c
* app/tools/gimpdodgeburntool.c
* app/tools/gimperasertool.c
* app/tools/gimppaintbrushtool.c
* app/tools/gimpsmudgetool.c: don't touch "motion_mode" here.
* app/tools/gimpimagemaptool.c
* app/tools/gimptransformtool.c: set "scroll_lock" to TRUE and
"preserve" to FALSE.
* app/tools/gimpcurvestool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimplevelstool.c
* app/tools/gimpfliptool.c
* app/tools/gimpperspectivetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsheartool.c: don't touch them here.
* app/tools/gimphistogramtool.[ch]: derive it from GimpImageMapTool
so it inherits it's control settings.
* app/tools/gimpellipseselecttool.c: don't set "preserve" to TRUE.
* app/tools/gimpmagnifytool.c
* app/tools/gimpmovetool.c: code formating paranoia.
* app/tools/gimptoolcontrol.c: fixed indentation.
2002-06-16 Michael Natterer <mitch@gimp.org>
* app/tools/gimpblendtool.c: set the witdh of the gradient preview

6
app/base/curves.c
View File

@ -93,7 +93,7 @@ typedef gdouble CRMatrix[4][4];
/* local function prototypes */
static void gimp_curves_tool_class_init (GimpCurvesToolClass *klass);
static void gimp_curves_tool_init (GimpTool *tool);
static void gimp_curves_tool_init (GimpCurvesTool *tool);
static void gimp_curves_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -265,10 +265,8 @@ gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
}
static void
gimp_curves_tool_init (GimpTool *tool)
gimp_curves_tool_init (GimpCurvesTool *tool)
{
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

6
app/base/hue-saturation.c
View File

@ -65,7 +65,7 @@
/* local function prototypes */
static void gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass);
static void gimp_hue_saturation_tool_init (GimpTool *tool);
static void gimp_hue_saturation_tool_init (GimpHueSaturationTool *tool);
static void gimp_hue_saturation_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -179,10 +179,8 @@ gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass)
}
static void
gimp_hue_saturation_tool_init (GimpTool *tool)
gimp_hue_saturation_tool_init (GimpHueSaturationTool *tool)
{
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

1
app/tools/gimpairbrushtool.c
View File

@ -115,7 +115,6 @@ gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
tool = GIMP_TOOL (airbrush);
paint_tool = GIMP_PAINT_TOOL (airbrush);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_AIRBRUSH_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;

2
app/tools/gimpbrushtool.c
View File

@ -156,6 +156,8 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool)
tool = GIMP_TOOL (paint_tool);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
paint_tool->pick_colors = FALSE;
paint_tool->pick_state = FALSE;
}

1
app/tools/gimpclonetool.c
View File

@ -158,7 +158,6 @@ gimp_clone_tool_init (GimpCloneTool *clone)
tool = GIMP_TOOL (clone);
paint_tool = GIMP_PAINT_TOOL (clone);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_CLONE_TOOL_CURSOR);
clone_core = g_object_new (GIMP_TYPE_CLONE, NULL);

10
app/tools/gimpconvolvetool.c
View File

@ -144,10 +144,12 @@ gimp_convolve_tool_init (GimpConvolveTool *convolve)
tool = GIMP_TOOL (convolve);
paint_tool = GIMP_PAINT_TOOL (convolve);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_MINUS);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_CONVOLVE, NULL);

6
app/tools/gimpcurvestool.c
View File

@ -93,7 +93,7 @@ typedef gdouble CRMatrix[4][4];
/* local function prototypes */
static void gimp_curves_tool_class_init (GimpCurvesToolClass *klass);
static void gimp_curves_tool_init (GimpTool *tool);
static void gimp_curves_tool_init (GimpCurvesTool *tool);
static void gimp_curves_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -265,10 +265,8 @@ gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
}
static void
gimp_curves_tool_init (GimpTool *tool)
gimp_curves_tool_init (GimpCurvesTool *tool)
{
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

7
app/tools/gimpdodgeburntool.c
View File

@ -122,9 +122,10 @@ gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn)
tool = GIMP_TOOL (dodgeburn);
paint_tool = GIMP_PAINT_TOOL (dodgeburn);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_DODGE_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_BURN_TOOL_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_DODGE_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_BURN_TOOL_CURSOR);
paint_tool->core = g_object_new (GIMP_TYPE_DODGEBURN, NULL);
}

10
app/tools/gimpellipseselecttool.c
View File

@ -123,14 +123,12 @@ gimp_ellipse_select_tool_class_init (GimpEllipseSelectToolClass *klass)
static void
gimp_ellipse_select_tool_init (GimpEllipseSelectTool *ellipse_select)
{
GimpTool *tool;
GimpSelectionTool *select_tool;
GimpTool *tool;
tool = GIMP_TOOL (ellipse_select);
select_tool = GIMP_SELECTION_TOOL (ellipse_select);
tool = GIMP_TOOL (ellipse_select);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ELLIPSE_SELECT_TOOL_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_ELLIPSE_SELECT_TOOL_CURSOR);
}
static void

10
app/tools/gimperasertool.c
View File

@ -120,10 +120,12 @@ gimp_eraser_tool_init (GimpEraserTool *eraser)
tool = GIMP_TOOL (eraser);
paint_tool = GIMP_PAINT_TOOL (eraser);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_MINUS);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_ERASER, NULL);
}

17
app/tools/gimpfliptool.c
View File

@ -156,13 +156,15 @@ gimp_flip_tool_init (GimpFlipTool *flip_tool)
tool = GIMP_TOOL (flip_tool);
transform_tool = GIMP_TRANSFORM_TOOL (flip_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_cursor (tool->control, GDK_SB_H_DOUBLE_ARROW);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_FLIP_HORIZONTAL_TOOL_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control, GDK_SB_V_DOUBLE_ARROW);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_FLIP_VERTICAL_TOOL_CURSOR);
gimp_tool_control_set_cursor (tool->control,
GDK_SB_H_DOUBLE_ARROW);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_FLIP_HORIZONTAL_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor (tool->control,
GDK_SB_V_DOUBLE_ARROW);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_FLIP_VERTICAL_TOOL_CURSOR);
transform_tool->use_grid = FALSE;
}
@ -239,7 +241,8 @@ gimp_flip_tool_cursor_update (GimpTool *tool,
gimp_tool_control_set_toggle_cursor (tool->control, GDK_SB_V_DOUBLE_ARROW);
}
gimp_tool_control_set_toggle (tool->control, (options->type == ORIENTATION_VERTICAL));
gimp_tool_control_set_toggle (tool->control,
(options->type == ORIENTATION_VERTICAL));
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);
}

12
app/tools/gimphistogramtool.c
View File

@ -82,7 +82,7 @@ struct _HistogramToolDialog
/* local function prototypes */
static void gimp_histogram_tool_class_init (GimpHistogramToolClass *klass);
static void gimp_histogram_tool_init (GimpHistogramTool *bc_tool);
static void gimp_histogram_tool_init (GimpHistogramTool *hist_tool);
static void gimp_histogram_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -155,7 +155,7 @@ gimp_histogram_tool_get_type (void)
(GInstanceInitFunc) gimp_histogram_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_TOOL,
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpHistogramTool",
&tool_info, 0);
}
@ -177,14 +177,8 @@ gimp_histogram_tool_class_init (GimpHistogramToolClass *klass)
}
static void
gimp_histogram_tool_init (GimpHistogramTool *bc_tool)
gimp_histogram_tool_init (GimpHistogramTool *hist_tool)
{
GimpTool *tool;
tool = GIMP_TOOL (bc_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE); /* why? */
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

6
app/tools/gimphistogramtool.h
View File

@ -20,7 +20,7 @@
#define __GIMP_HISTOGRAM_TOOL_H__
#include "libgimptool/gimptool.h"
#include "gimpimagemaptool.h"
#define HISTOGRAM_WIDTH 256
@ -40,12 +40,12 @@ typedef struct _GimpHistogramToolClass GimpHistogramToolClass;
struct _GimpHistogramTool
{
GimpTool parent_instance;
GimpImageMapTool parent_instance;
};
struct _GimpHistogramToolClass
{
GimpToolClass parent_class;
GimpImageMapToolClass parent_class;
};

6
app/tools/gimphuesaturationtool.c
View File

@ -65,7 +65,7 @@
/* local function prototypes */
static void gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass);
static void gimp_hue_saturation_tool_init (GimpTool *tool);
static void gimp_hue_saturation_tool_init (GimpHueSaturationTool *tool);
static void gimp_hue_saturation_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -179,10 +179,8 @@ gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass)
}
static void
gimp_hue_saturation_tool_init (GimpTool *tool)
gimp_hue_saturation_tool_init (GimpHueSaturationTool *tool)
{
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

3
app/tools/gimpimagemaptool.c
View File

@ -77,5 +77,6 @@ gimp_image_map_tool_init (GimpImageMapTool *image_map_tool)
tool = GIMP_TOOL (image_map_tool);
/* child must create control. */
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}

6
app/tools/gimplevelstool.c
View File

@ -129,7 +129,7 @@ struct _LevelsDialog
/* local function prototypes */
static void gimp_levels_tool_class_init (GimpLevelsToolClass *klass);
static void gimp_levels_tool_init (GimpTool *tool);
static void gimp_levels_tool_init (GimpLevelsTool *tool);
static void gimp_levels_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -258,10 +258,8 @@ gimp_levels_tool_class_init (GimpLevelsToolClass *klass)
}
static void
gimp_levels_tool_init (GimpTool *tool)
gimp_levels_tool_init (GimpLevelsTool *tool)
{
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void

19
app/tools/gimpmagnifytool.c
View File

@ -191,13 +191,18 @@ gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool)
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_cursor (tool->control, GIMP_ZOOM_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ZOOM_TOOL_CURSOR);
gimp_tool_control_set_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_PLUS);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ZOOM_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_ZOOM_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_MINUS);
gimp_tool_control_set_cursor (tool->control,
GIMP_ZOOM_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_ZOOM_TOOL_CURSOR);
gimp_tool_control_set_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_PLUS);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_ZOOM_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_ZOOM_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_MINUS);
}
static void

4
app/tools/gimpmovetool.c
View File

@ -187,8 +187,8 @@ gimp_move_tool_init (GimpMoveTool *move_tool)
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_handles_empty_image (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_MOVE_TOOL_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_MOVE_TOOL_CURSOR);
}
static void

2
app/tools/gimppaintbrushtool.c
View File

@ -107,10 +107,8 @@ gimp_paintbrush_tool_init (GimpPaintbrushTool *paintbrush)
tool = GIMP_TOOL (paintbrush);
paint_tool = GIMP_PAINT_TOOL (paintbrush);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_PAINTBRUSH_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_PAINTBRUSH, NULL);
}

2
app/tools/gimppainttool.c
View File

@ -156,6 +156,8 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool)
tool = GIMP_TOOL (paint_tool);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
paint_tool->pick_colors = FALSE;
paint_tool->pick_state = FALSE;
}

6
app/tools/gimpperspectivetool.c
View File

@ -132,10 +132,8 @@ gimp_perspective_tool_init (GimpPerspectiveTool *perspective_tool)
tool = GIMP_TOOL (perspective_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_PERSPECTIVE_TOOL_CURSOR);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_PERSPECTIVE_TOOL_CURSOR);
}
static TileManager *

2
app/tools/gimprotatetool.c
View File

@ -154,8 +154,6 @@ gimp_rotate_tool_init (GimpRotateTool *rotate_tool)
tool = GIMP_TOOL (rotate_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ROTATE_TOOL_CURSOR);
}

2
app/tools/gimpscaletool.c
View File

@ -153,8 +153,6 @@ gimp_scale_tool_init (GimpScaleTool *scale_tool)
tool = GIMP_TOOL (scale_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_RESIZE_TOOL_CURSOR);
}

3
app/tools/gimpsheartool.c
View File

@ -151,9 +151,8 @@ gimp_shear_tool_init (GimpShearTool *shear_tool)
tool = GIMP_TOOL (shear_tool);
transform_tool = GIMP_TRANSFORM_TOOL (shear_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_SHEAR_TOOL_CURSOR);
transform_tool->use_center = FALSE;
}

1
app/tools/gimpsmudgetool.c
View File

@ -109,7 +109,6 @@ gimp_smudge_tool_init (GimpSmudgeTool *smudge)
tool = GIMP_TOOL (smudge);
paint_tool = GIMP_PAINT_TOOL (smudge);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_SMUDGE_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;

1
app/tools/gimpsourcetool.c
View File

@ -158,7 +158,6 @@ gimp_clone_tool_init (GimpCloneTool *clone)
tool = GIMP_TOOL (clone);
paint_tool = GIMP_PAINT_TOOL (clone);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_CLONE_TOOL_CURSOR);
clone_core = g_object_new (GIMP_TYPE_CLONE, NULL);

187
app/tools/gimptoolcontrol.c
View File

@ -26,10 +26,12 @@
static void gimp_tool_control_class_init (GimpToolControlClass *klass);
static void gimp_tool_control_init (GimpToolControl *tool);
static void gimp_tool_control_init (GimpToolControl *tool);
static GimpObjectClass *parent_class = NULL;
GType
gimp_tool_control_get_type (void)
{
@ -52,7 +54,7 @@ gimp_tool_control_get_type (void)
tool_control_type = g_type_register_static (GIMP_TYPE_OBJECT,
"GimpToolControl",
&tool_control_info, 0);
&tool_control_info, 0);
}
return tool_control_type;
@ -88,261 +90,256 @@ gimp_tool_control_init (GimpToolControl *control)
}
void
gimp_tool_control_pause (GimpToolControl *control)
gimp_tool_control_pause (GimpToolControl *control)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
/* control->state = PAUSED ? */
control->paused_count++;
}
void
gimp_tool_control_resume (GimpToolControl *control)
gimp_tool_control_resume (GimpToolControl *control)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->paused_count--;
}
gboolean
gimp_tool_control_is_paused (GimpToolControl *control)
gimp_tool_control_is_paused (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->paused_count > 0;
}
void
gimp_tool_control_activate (GimpToolControl *control)
gimp_tool_control_activate (GimpToolControl *control)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->state = ACTIVE;
control->state = ACTIVE;
}
void
gimp_tool_control_halt (GimpToolControl *control)
gimp_tool_control_halt (GimpToolControl *control)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->state = INACTIVE;
control->paused_count = 0;
control->state = INACTIVE;
control->paused_count = 0;
}
gboolean
gimp_tool_control_is_active (GimpToolControl *control)
gimp_tool_control_is_active (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->state == ACTIVE;
}
void
gimp_tool_control_set_toggle (GimpToolControl *control,
gboolean toggled)
gimp_tool_control_set_toggle (GimpToolControl *control,
gboolean toggled)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->toggled = toggled;
control->toggled = toggled ? TRUE : FALSE;
}
void
gimp_tool_control_set_handles_empty_image (GimpToolControl *control,
gboolean handle_empty)
gimp_tool_control_set_handles_empty_image (GimpToolControl *control,
gboolean handle_empty)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->handle_empty_image = handle_empty;
control->handle_empty_image = handle_empty ? TRUE : FALSE;
}
void
gimp_tool_control_set_snap_to (GimpToolControl *control,
gboolean snap_to)
gimp_tool_control_set_snap_to (GimpToolControl *control,
gboolean snap_to)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->auto_snap_to = snap_to;
control->auto_snap_to = snap_to ? TRUE : FALSE;
}
void
gimp_tool_control_set_motion_mode (GimpToolControl *control,
GimpMotionMode motion_mode)
gimp_tool_control_set_motion_mode (GimpToolControl *control,
GimpMotionMode motion_mode)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->motion_mode = motion_mode;
}
void
gimp_tool_control_set_preserve (GimpToolControl *control,
gboolean preserve)
gimp_tool_control_set_preserve (GimpToolControl *control,
gboolean preserve)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->preserve = preserve;
control->preserve = preserve ? TRUE : FALSE;
}
void
gimp_tool_control_set_cursor (GimpToolControl *control,
GdkCursorType cursor)
gimp_tool_control_set_cursor (GimpToolControl *control,
GdkCursorType cursor)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->cursor = cursor;
control->cursor = cursor;
}
void
gimp_tool_control_set_tool_cursor (GimpToolControl *control,
GimpToolCursorType cursor)
gimp_tool_control_set_tool_cursor (GimpToolControl *control,
GimpToolCursorType cursor)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->tool_cursor = cursor;
}
void
gimp_tool_control_set_cursor_modifier (GimpToolControl *control,
GimpCursorModifier cmodifier)
gimp_tool_control_set_cursor_modifier (GimpToolControl *control,
GimpCursorModifier cmodifier)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->cursor_modifier = cmodifier;
}
void
gimp_tool_control_set_toggle_cursor (GimpToolControl *control,
GdkCursorType cursor)
gimp_tool_control_set_toggle_cursor (GimpToolControl *control,
GdkCursorType cursor)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->toggle_cursor = cursor;
control->toggle_cursor = cursor;
}
void
gimp_tool_control_set_toggle_tool_cursor (GimpToolControl *control,
GimpToolCursorType cursor)
gimp_tool_control_set_toggle_tool_cursor (GimpToolControl *control,
GimpToolCursorType cursor)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->toggle_tool_cursor = cursor;
control->toggle_tool_cursor = cursor;
}
void
gimp_tool_control_set_toggle_cursor_modifier (GimpToolControl *control,
GimpCursorModifier cmodifier)
gimp_tool_control_set_toggle_cursor_modifier (GimpToolControl *control,
GimpCursorModifier cmodifier)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->toggle_cursor_modifier = cmodifier;
}
void
gimp_tool_control_set_scroll_lock (GimpToolControl *control,
gboolean scroll_lock)
gimp_tool_control_set_scroll_lock (GimpToolControl *control,
gboolean scroll_lock)
{
g_return_if_fail(GIMP_IS_TOOL_CONTROL(control));
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
control->scroll_lock = scroll_lock;
control->scroll_lock = scroll_lock ? TRUE : FALSE;
}
GimpMotionMode
gimp_tool_control_motion_mode (GimpToolControl *control)
gimp_tool_control_motion_mode (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), GIMP_MOTION_MODE_HINT);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), GIMP_MOTION_MODE_HINT);
return control->motion_mode;
}
gboolean
gimp_tool_control_handles_empty_image (GimpToolControl *control)
gimp_tool_control_handles_empty_image (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->handle_empty_image;
}
gboolean
gimp_tool_control_auto_snap_to (GimpToolControl *control)
gimp_tool_control_auto_snap_to (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->auto_snap_to;
}
gboolean
gimp_tool_control_preserve (GimpToolControl *control)
gimp_tool_control_preserve (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->preserve;
}
gboolean
gimp_tool_control_scroll_lock (GimpToolControl *control)
gimp_tool_control_scroll_lock (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->scroll_lock;
}
gboolean
gimp_tool_control_is_toggled (GimpToolControl *control)
gimp_tool_control_is_toggled (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->toggled;
}
GdkCursorType
gimp_tool_control_get_cursor (GimpToolControl *control)
gimp_tool_control_get_cursor (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->cursor;
}
GdkCursorType
gimp_tool_control_get_toggle_cursor (GimpToolControl *control)
gimp_tool_control_get_toggle_cursor (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->toggle_cursor;
}
GimpToolCursorType
gimp_tool_control_get_tool_cursor (GimpToolControl *control)
GimpToolCursorType
gimp_tool_control_get_tool_cursor (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->tool_cursor;
}
GimpToolCursorType
gimp_tool_control_get_toggle_tool_cursor (GimpToolControl *control)
GimpToolCursorType
gimp_tool_control_get_toggle_tool_cursor (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->toggle_tool_cursor;
}
GimpCursorModifier
gimp_tool_control_get_cursor_modifier (GimpToolControl *control)
gimp_tool_control_get_cursor_modifier (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->cursor_modifier;
}
GimpCursorModifier
gimp_tool_control_get_toggle_cursor_modifier (GimpToolControl *control)
GimpCursorModifier
gimp_tool_control_get_toggle_cursor_modifier (GimpToolControl *control)
{
g_return_val_if_fail(GIMP_IS_TOOL_CONTROL(control), FALSE);
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
return control->toggle_cursor_modifier;
}

65
app/tools/gimptransformtool.c
View File

@ -191,6 +191,9 @@ gimp_transform_tool_init (GimpTransformTool *transform_tool)
tool = GIMP_TOOL (transform_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
transform_tool->function = TRANSFORM_CREATING;
transform_tool->original = NULL;
@ -550,43 +553,47 @@ gimp_transform_tool_cursor_update (GimpTool *tool,
{
GimpTransformTool *tr_tool;
GimpDrawable *drawable;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
GimpCursorModifier cmodifier = GIMP_CURSOR_MODIFIER_NONE;
tr_tool = GIMP_TRANSFORM_TOOL (tool);
if ((drawable = gimp_image_active_drawable (gdisp->gimage)))
if (tr_tool->use_grid)
{
gint off_x, off_y;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
GimpCursorModifier cmodifier = GIMP_CURSOR_MODIFIER_NONE;
gimp_drawable_offsets (drawable, &off_x, &off_y);
if ((drawable = gimp_image_active_drawable (gdisp->gimage)))
{
gint off_x, off_y;
if (GIMP_IS_LAYER (drawable) &&
gimp_layer_get_mask (GIMP_LAYER (drawable)))
{
ctype = GIMP_BAD_CURSOR;
}
else if (coords->x >= off_x &&
coords->y >= off_y &&
coords->x < (off_x + drawable->width) &&
coords->y < (off_y + drawable->height))
{
if (gimp_image_mask_is_empty (gdisp->gimage) ||
gimp_image_mask_value (gdisp->gimage, coords->x, coords->y))
{
ctype = GIMP_MOUSE_CURSOR;
}
}
gimp_drawable_offsets (drawable, &off_x, &off_y);
if (GIMP_IS_LAYER (drawable) &&
gimp_layer_get_mask (GIMP_LAYER (drawable)))
{
ctype = GIMP_BAD_CURSOR;
}
else if (coords->x >= off_x &&
coords->y >= off_y &&
coords->x < (off_x + drawable->width) &&
coords->y < (off_y + drawable->height))
{
if (gimp_image_mask_is_empty (gdisp->gimage) ||
gimp_image_mask_value (gdisp->gimage, coords->x, coords->y))
{
ctype = GIMP_MOUSE_CURSOR;
}
}
}
if (tr_tool->use_center && tr_tool->function == TRANSFORM_HANDLE_CENTER)
{
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
}
gimp_tool_control_set_cursor (tool->control, ctype);
gimp_tool_control_set_cursor_modifier (tool->control, cmodifier);
}
if (tr_tool->use_center && tr_tool->function == TRANSFORM_HANDLE_CENTER)
{
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
}
gimp_tool_control_set_cursor (tool->control, ctype);
gimp_tool_control_set_cursor_modifier (tool->control, cmodifier);
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);
}