callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cursors/Makefile.am cursors/cursor-corner-bottom-left.png

Browse Source 
2006-06-02  Michael Natterer  <mitch@gimp.org>

	* cursors/Makefile.am
	* cursors/cursor-corner-bottom-left.png
	* cursors/cursor-corner-bottom-right.png
	* cursors/cursor-corner-top-left.png
	* cursors/cursor-corner-top-right.png
	* cursors/cursor-side-bottom.png
	* cursors/cursor-side-left.png
	* cursors/cursor-side-right.png
	* cursors/cursor-side-top.png
	* cursors/xbm/cursor-corner-bottom-left-mask.xbm
	* cursors/xbm/cursor-corner-bottom-left.xbm
	* cursors/xbm/cursor-corner-bottom-right-mask.xbm
	* cursors/xbm/cursor-corner-bottom-right.xbm
	* cursors/xbm/cursor-corner-top-left-mask.xbm
	* cursors/xbm/cursor-corner-top-left.xbm
	* cursors/xbm/cursor-corner-top-right-mask.xbm
	* cursors/xbm/cursor-corner-top-right.xbm
	* cursors/xbm/cursor-side-bottom-mask.xbm
	* cursors/xbm/cursor-side-bottom.xbm
	* cursors/xbm/cursor-side-left-mask.xbm
	* cursors/xbm/cursor-side-left.xbm
	* cursors/xbm/cursor-side-right-mask.xbm
	* cursors/xbm/cursor-side-right.xbm
	* cursors/xbm/cursor-side-top-mask.xbm
	* cursors/xbm/cursor-side-top.xbm: new cursors for edge and corner
	resizing. They perfectly align with the small crosshair and can be
	used together with tool cursors and cursor modifiers.

	* cursors/gimp-tool-cursors.xcf: add them here too.

	* app/widgets/widgets-enums.h: add them to the GimpCursorType enum.

	* app/widgets/gimpcursor.c: add them here too.

	* app/display/gimpdisplayshell-cursor.c: treat them like the small
	crosshair (don't replace them by the small crosshair but use them
	as-is). Also allow the bad modifier with the large crosshair.

	* app/tools/gimprectangletool.c
	(gimp_rectangle_tool_cursor_update): use the new cursors. Don't
	call gimp_tool_set_cursor() here.

	(gimp_rectangle_tool_response): reset "function" to RECT_CREATING
	when resetting the tool.

	* app/tools/gimpselectiontool.[ch] (struct GimpSelectionTool):
	added boolean member "allow_move" which defalts to TRUE.

	(gimp_selection_tool_oper_update): don't move masks, floating
	selections or anything when "allow_move" is FALSE. Changed
	behavior of click inside a selection to simply create a new
	selection, need to press alt+shift now to drag-float the
	selection. Please test this, it's apretty fundamental change!

	(gimp_selection_tool_cursor_update): use the tool's configured
	cursor instead of always GIMP_CURSOR_MOUSE, so this function can
	be called after gimp_rectangle_tool_cursor_update() to add the
	plus, minus etc. modifiers.

	* app/tools/gimpnewrectselecttool.c: implement
	GimpTool::cursor_update() and call
	gimp_rectangle_tool_cursor_update() from there. Chain up to get
	the plus, minus etc. modifiers added.

	Re-enble selection moving:

	(gimp_new_rect_select_tool_oper_update): set GimpSelectionTool's
	"allow_move" to FALSE unless the rectangle tool is in an idle
	state.

	(gimp_new_rect_select_tool_button_press): allow a selection moving
	to be started if the rectangle tool is idle. Fall back to starting
	a rect select if gimp_selection_tool_start_edit() returned FALSE.
This commit is contained in:
Michael Natterer
2006-06-02 15:23:47 +00:00
committed by Michael Natterer
parent 3a7629733a
commit d1a76d93f7
35 changed files with 602 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/tools/gimpselectiontool.c
View File

@ -80,8 +80,10 @@ gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
static void
gimp_selection_tool_init (GimpSelectionTool *selection_tool)
{
selection_tool->op = SELECTION_REPLACE;
selection_tool->saved_op = SELECTION_REPLACE;
selection_tool->op = SELECTION_REPLACE;
selection_tool->saved_op = SELECTION_REPLACE;
selection_tool->allow_move = TRUE;
}
static void
@ -194,16 +196,24 @@ gimp_selection_tool_oper_update (GimpTool *tool,
}
}
if ((state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && move_layer)
if (selection_tool->allow_move &&
(state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && move_layer)
{
selection_tool->op = SELECTION_MOVE_COPY; /* move a copy of the selection */
}
else if ((state & GDK_MOD1_MASK) && ! gimp_channel_is_empty (selection))
else if (selection_tool->allow_move &&
(state & GDK_MOD1_MASK) && (state & GDK_SHIFT_MASK) && move_layer)
{
selection_tool->op = SELECTION_MOVE; /* move the selection */
}
else if (selection_tool->allow_move &&
(state & GDK_MOD1_MASK) && ! gimp_channel_is_empty (selection))
{
selection_tool->op = SELECTION_MOVE_MASK; /* move the selection mask */
}
else if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
(move_layer || move_floating_sel))
else if (selection_tool->allow_move &&
! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
move_floating_sel)
{
selection_tool->op = SELECTION_MOVE; /* move the selection */
}
@ -273,37 +283,40 @@ gimp_selection_tool_cursor_update (GimpTool *tool,
{
GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
GimpToolCursorType tool_cursor;
GimpCursorModifier cmodifier;
GimpCursorModifier modifier;
tool_cursor = gimp_tool_control_get_tool_cursor (tool->control);
cmodifier = GIMP_CURSOR_MODIFIER_NONE;
modifier = GIMP_CURSOR_MODIFIER_NONE;
switch (selection_tool->op)
{
case SELECTION_ADD:
cmodifier = GIMP_CURSOR_MODIFIER_PLUS;
modifier = GIMP_CURSOR_MODIFIER_PLUS;
break;
case SELECTION_SUBTRACT:
cmodifier = GIMP_CURSOR_MODIFIER_MINUS;
modifier = GIMP_CURSOR_MODIFIER_MINUS;
break;
case SELECTION_INTERSECT:
cmodifier = GIMP_CURSOR_MODIFIER_INTERSECT;
modifier = GIMP_CURSOR_MODIFIER_INTERSECT;
break;
case SELECTION_REPLACE:
break;
case SELECTION_MOVE_MASK:
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
modifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case SELECTION_MOVE:
case SELECTION_MOVE_COPY:
tool_cursor = GIMP_TOOL_CURSOR_MOVE;
break;
case SELECTION_ANCHOR:
cmodifier = GIMP_CURSOR_MODIFIER_ANCHOR;
modifier = GIMP_CURSOR_MODIFIER_ANCHOR;
break;
}
gimp_tool_set_cursor (tool, display, GIMP_CURSOR_MOUSE, tool_cursor, cmodifier);
gimp_tool_set_cursor (tool, display,
gimp_tool_control_get_cursor (tool->control),
tool_cursor,
modifier);
}