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

also don't show the shell highlight when a rectangle is being moved.

Browse Source 
2007-11-05  Martin Nordholts  <martinn@svn.gnome.org>

	* app/tools/gimprectangletool.c: also don't show the shell
	highlight when a rectangle is being moved. Achieved through
	slightly modifying code logic and renaming variables and functions
	a bit.

svn path=/trunk/; revision=24070
This commit is contained in:
Martin Nordholts
2007-11-05 20:17:56 +00:00
committed by Martin Nordholts
parent b36f958a29
commit 0e70d5f5a7
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-11-05 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.c: also don't show the shell
highlight when a rectangle is being moved. Achieved through
slightly modifying code logic and renaming variables and functions
a bit.
2007-11-05 Sven Neumann <sven@gimp.org> 2007-11-05 Sven Neumann <sven@gimp.org>
* app/widgets/gimpgradienteditor.[ch]: use Cairo to draw the controls. * app/widgets/gimpgradienteditor.[ch]: use Cairo to draw the controls.

40
app/tools/gimprectangletool.c
View File

@ -156,8 +156,10 @@ struct _GimpRectangleToolPrivate
*/ */
gboolean narrow_mode; gboolean narrow_mode;
/* True when the rectangle is being rubber banded. */ /* True when the rectangle is being adjusted (moved or
gboolean rubber_banding; * rubber-banded).
*/
gboolean rect_adjusting;
/* For what scale the handle sizes is calculated. We must cache this so that /* For what scale the handle sizes is calculated. We must cache this so that
* we can differentiate between when the tool is resumed because of zoom level * we can differentiate between when the tool is resumed because of zoom level
@ -217,7 +219,7 @@ static GtkAnchorType gimp_rectangle_tool_get_anchor (GimpRectangleTool
static void gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool); static void gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool);
static gboolean gimp_rectangle_tool_rubber_banding_func (GimpRectangleTool *rect_tool); static gboolean gimp_rectangle_tool_rect_adjusting_func (GimpRectangleTool *rect_tool);
static void gimp_rectangle_tool_update_handle_sizes (GimpRectangleTool *rect_tool); static void gimp_rectangle_tool_update_handle_sizes (GimpRectangleTool *rect_tool);
@ -908,7 +910,7 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
} }
/* Is the rectangle being rubber-banded? */ /* Is the rectangle being rubber-banded? */
private->rubber_banding = gimp_rectangle_tool_rubber_banding_func (rect_tool); private->rect_adjusting = gimp_rectangle_tool_rect_adjusting_func (rect_tool);
gimp_rectangle_tool_update_highlight (rect_tool); gimp_rectangle_tool_update_highlight (rect_tool);
@ -989,7 +991,7 @@ gimp_rectangle_tool_button_release (GimpTool *tool,
gimp_tool_control_set_snap_offsets (tool->control, 0, 0, 0, 0); gimp_tool_control_set_snap_offsets (tool->control, 0, 0, 0, 0);
/* On button release, we are not rubber-banding the rectangle any longer. */ /* On button release, we are not rubber-banding the rectangle any longer. */
private->rubber_banding = FALSE; private->rect_adjusting = FALSE;
gimp_rectangle_tool_update_highlight (rect_tool); gimp_rectangle_tool_update_highlight (rect_tool);
gimp_rectangle_tool_update_handle_sizes (rect_tool); gimp_rectangle_tool_update_handle_sizes (rect_tool);
@ -1046,11 +1048,10 @@ gimp_rectangle_tool_motion (GimpTool *tool,
current_x, current_x,
current_y); current_y);
/* Update the highlight, but only if it is not being /* Update the highlight, but only if it is not being adjusted. If it
* rubber-banded. If it is being rubber-banded, the highlight is not * is not being adjusted, the highlight is not shown anyway.
* shown anyway.
*/ */
if (! gimp_rectangle_tool_rubber_banding_func (rect_tool)) if (gimp_rectangle_tool_rect_adjusting_func (rect_tool))
gimp_rectangle_tool_update_highlight (rect_tool); gimp_rectangle_tool_update_highlight (rect_tool);
if (private->function != RECT_MOVING && if (private->function != RECT_MOVING &&
@ -2708,7 +2709,7 @@ gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool)
g_object_get (options, "highlight", &highlight, NULL); g_object_get (options, "highlight", &highlight, NULL);
/* Don't show the highlight when the mouse is down. */ /* Don't show the highlight when the mouse is down. */
if (! highlight || private->rubber_banding) if (! highlight || private->rect_adjusting)
{ {
gimp_display_shell_set_highlight (shell, NULL); gimp_display_shell_set_highlight (shell, NULL);
} }
@ -2729,22 +2730,23 @@ gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool)
} }
/** /**
* gimp_rectangle_tool_rubber_banding_func: * gimp_rectangle_tool_rect_adjusting_func:
* *
* Returns: %TRUE if the current function is a rubber-banding * Returns: %TRUE if the current function is a rectangle adjusting
* function. * function.
*/ */
static gboolean static gboolean
gimp_rectangle_tool_rubber_banding_func (GimpRectangleTool *rect_tool) gimp_rectangle_tool_rect_adjusting_func (GimpRectangleTool *rect_tool)
{ {
GimpRectangleToolPrivate *private; GimpRectangleToolPrivate *private;
gboolean rubber_banding_func; gboolean rect_adjusting_func;
rubber_banding_func = FALSE; rect_adjusting_func = FALSE;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool); private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
switch (private->function) switch (private->function)
{ {
case RECT_MOVING:
case RECT_CREATING: case RECT_CREATING:
case RECT_RESIZING_LEFT: case RECT_RESIZING_LEFT:
case RECT_RESIZING_RIGHT: case RECT_RESIZING_RIGHT:
@ -2754,15 +2756,17 @@ gimp_rectangle_tool_rubber_banding_func (GimpRectangleTool *rect_tool)
case RECT_RESIZING_UPPER_RIGHT: case RECT_RESIZING_UPPER_RIGHT:
case RECT_RESIZING_LOWER_LEFT: case RECT_RESIZING_LOWER_LEFT:
case RECT_RESIZING_LOWER_RIGHT: case RECT_RESIZING_LOWER_RIGHT:
rubber_banding_func = TRUE; rect_adjusting_func = TRUE;
break; break;
case RECT_INACTIVE:
case RECT_DEAD:
default: default:
rubber_banding_func = FALSE; rect_adjusting_func = FALSE;
break; break;
} }
return rubber_banding_func; return rect_adjusting_func;
} }
/** /**