app/tools/gimpaligntool.c app/tools/gimpcolortool.c

2005-11-19  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpaligntool.c
	* app/tools/gimpcolortool.c
	* app/tools/gimpfliptool.c
	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimptransformtool.c
	* app/tools/gimpvectortool.c: started to get rid of all stock GDK
	cursors in preparation of fixing bug #158407.
This commit is contained in:
Michael Natterer 2005-11-19 22:16:34 +00:00 committed by Michael Natterer
parent 0ec0514ba2
commit 68cecb38ff
8 changed files with 24 additions and 18 deletions

View File

@ -1,3 +1,14 @@
2005-11-19 Michael Natterer <mitch@gimp.org>
* app/tools/gimpaligntool.c
* app/tools/gimpcolortool.c
* app/tools/gimpfliptool.c
* app/tools/gimpmagnifytool.c
* app/tools/gimpmovetool.c
* app/tools/gimptransformtool.c
* app/tools/gimpvectortool.c: started to get rid of all stock GDK
cursors in preparation of fixing bug #158407.
2005-11-18 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpgradienteditor.c (view_events):

View File

@ -375,7 +375,7 @@ gimp_align_tool_cursor_update (GimpTool *tool,
coords, 7, 7,
NULL, NULL, NULL, NULL, NULL, NULL))
{
cursor = GDK_HAND2;
cursor = GIMP_CURSOR_MOUSE;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
}
}
@ -400,7 +400,7 @@ gimp_align_tool_cursor_update (GimpTool *tool,
}
else
{
cursor = GDK_HAND2;
cursor = GIMP_CURSOR_MOUSE;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
modifier = GIMP_CURSOR_MODIFIER_MOVE;
}

View File

@ -517,7 +517,7 @@ gimp_color_tool_cursor_update (GimpTool *tool,
if (color_tool->sample_point)
{
gimp_tool_set_cursor (tool, gdisp,
GIMP_CURSOR_COLOR_PICKER,
GIMP_CURSOR_MOUSE,
GIMP_TOOL_CURSOR_COLOR_PICKER,
GIMP_CURSOR_MODIFIER_MOVE);
}
@ -532,7 +532,7 @@ gimp_color_tool_cursor_update (GimpTool *tool,
(color_tool->options->sample_merged ||
gimp_image_coords_in_active_drawable (gdisp->gimage, coords)))
{
cursor = GIMP_CURSOR_COLOR_PICKER;
cursor = GIMP_CURSOR_MOUSE;
}
switch (color_tool->pick_mode)
@ -730,7 +730,7 @@ gimp_color_tool_start_sample_point (GimpTool *tool,
color_tool->sample_point_y = -1;
gimp_tool_set_cursor (tool, gdisp,
GIMP_CURSOR_COLOR_PICKER,
GIMP_CURSOR_MOUSE,
GIMP_TOOL_CURSOR_COLOR_PICKER,
GIMP_CURSOR_MODIFIER_MOVE);

View File

@ -138,12 +138,8 @@ gimp_flip_tool_init (GimpFlipTool *flip_tool)
GimpTransformTool *transform_tool = GIMP_TRANSFORM_TOOL (flip_tool);
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_cursor (tool->control,
GDK_SB_H_DOUBLE_ARROW);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_FLIP_HORIZONTAL);
gimp_tool_control_set_toggle_cursor (tool->control,
GDK_SB_V_DOUBLE_ARROW);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_FLIP_VERTICAL);
@ -212,8 +208,8 @@ gimp_flip_tool_cursor_update (GimpTool *tool,
}
else
{
gimp_tool_control_set_cursor (tool->control, GDK_SB_H_DOUBLE_ARROW);
gimp_tool_control_set_toggle_cursor (tool->control, GDK_SB_V_DOUBLE_ARROW);
gimp_tool_control_set_cursor (tool->control, GIMP_CURSOR_MOUSE);
gimp_tool_control_set_toggle_cursor (tool->control, GIMP_CURSOR_MOUSE);
}
gimp_tool_control_set_toggle (tool->control,

View File

@ -163,7 +163,7 @@ gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool)
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_cursor (tool->control,
GIMP_CURSOR_ZOOM);
GIMP_CURSOR_MOUSE);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_ZOOM);
gimp_tool_control_set_cursor_modifier (tool->control,

View File

@ -700,7 +700,7 @@ gimp_move_tool_cursor_update (GimpTool *tool,
coords, 7, 7,
NULL, NULL, NULL, NULL, NULL, NULL))
{
cursor = GDK_HAND2;
cursor = GIMP_CURSOR_MOUSE;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
}
}
@ -732,7 +732,7 @@ gimp_move_tool_cursor_update (GimpTool *tool,
FUNSCALEX (shell, snap_distance),
FUNSCALEY (shell, snap_distance))))
{
cursor = GDK_HAND2;
cursor = GIMP_CURSOR_MOUSE;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
modifier = GIMP_CURSOR_MODIFIER_MOVE;
}
@ -753,7 +753,7 @@ gimp_move_tool_cursor_update (GimpTool *tool,
}
else
{
cursor = GDK_HAND2;
cursor = GIMP_CURSOR_MOUSE;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
modifier = GIMP_CURSOR_MODIFIER_MOVE;
}
@ -844,7 +844,7 @@ gimp_move_tool_start_guide (GimpMoveTool *move,
move->guide_orientation = orientation;
gimp_tool_set_cursor (tool, gdisp,
GDK_HAND2,
GIMP_CURSOR_MOUSE,
GIMP_TOOL_CURSOR_HAND,
GIMP_CURSOR_MODIFIER_MOVE);

View File

@ -651,7 +651,7 @@ gimp_transform_tool_cursor_update (GimpTool *tool,
if (tr_tool->use_grid)
{
GimpChannel *selection = gimp_image_get_mask (gdisp->gimage);
GimpCursorType cursor = GDK_TOP_LEFT_ARROW;
GimpCursorType cursor = GIMP_CURSOR_MOUSE;
GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_NONE;
switch (options->type)

View File

@ -1271,7 +1271,6 @@ gimp_vector_tool_cursor_update (GimpTool *tool,
switch (vector_tool->function)
{
case VECTORS_SELECT_VECTOR:
cursor = GDK_HAND2;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
break;