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

Added members to keep track of for what shell scale the handle sizes were 

2007-07-15  Martin Nordholts  <martinn@svn.gnome.org>

	* app/tools/gimprectangletool.c (struct
	_GimpRectangleToolPrivate): Added members to keep track of for
	what shell scale the handle sizes were calculated. This is
	necessary so that in
	(gimp_rectangle_tool_control): we only update the handle sizes
	when the zoom level has changed. We must test this, because the
	tool is also paused/resumed when highlightning is on, and we don't
	want to update handle sizes just because highlightning happends to
	be on.
	(gimp_rectangle_tool_scale_has_changed): Added helper function.

svn path=/trunk/; revision=22933
This commit is contained in:
Martin Nordholts 2007-07-15 09:43:49 +00:00 committed by Martin Nordholts
parent 535480139f
commit 6b2187c1bd
2 changed files with 82 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2007-07-15 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.c (struct
_GimpRectangleToolPrivate): Added members to keep track of for
what shell scale the handle sizes were calculated. This is
necessary so that in
(gimp_rectangle_tool_control): we only update the handle sizes
when the zoom level has changed. We must test this, because the
tool is also paused/resumed when highlightning is on, and we don't
want to update handle sizes just because highlightning happends to
be on.
(gimp_rectangle_tool_scale_has_changed): Added helper function.
2007-07-14 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.c

90
app/tools/gimprectangletool.c
View File

@ -115,30 +115,41 @@ struct _GimpRectangleToolPrivate
* sure these variables are in consistent states.
*/
gint x1, y1; /* upper left hand coordinate */
gint x2, y2; /* lower right hand coords */
guint function; /* moving or resizing */
/* Coordinates of upper left and lower right rectangle corners. */
gint x1, y1;
gint x2, y2;
GimpRectangleConstraint constraint; /* how to constrain rectangle */
/* What modification state the rectangle is in. What corner are we resizing,
* or are we moving the rectangle? etc.
*/
guint function;
gint lastx; /* previous x coord */
gint lasty; /* previous y coord */
/* How to constrain the rectangle. */
GimpRectangleConstraint constraint;
gint handle_w; /* handle width */
gint handle_h; /* handle height */
/* Previous coordinate applied to the rectangle. */
gint lastx;
gint lasty;
/* Top and bottom side handle
* width.
*/
/* Width and height of corner handles. */
gint handle_w;
gint handle_h;
/* Width and height of side handles. */
gint top_and_bottom_handle_w;
/* Left and right side handle
* height.
*/
gint left_and_right_handle_h;
gint saved_x1; /* for saving in case action */
gint saved_y1; /* is canceled */
/* 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
* just has changed or because the highlight has just been updated.
*/
gdouble scale_x_used_for_handle_size_calculations;
gdouble scale_y_used_for_handle_size_calculations;
/* For saving in case of cancelation. */
gint saved_x1;
gint saved_y1;
gint saved_x2;
gint saved_y2;
gdouble saved_center_x;
@ -146,7 +157,8 @@ struct _GimpRectangleToolPrivate
gint suppress_updates;
GimpRectangleGuide guide; /* synced with options->guide, only exists for drawing */
/* Synced with options->guide, only exists for drawing. */
GimpRectangleGuide guide;
};
@ -185,6 +197,9 @@ static void gimp_rectangle_tool_set_highlight (GimpRectangleTool *rectang
static void gimp_rectangle_tool_update_handle_sizes (GimpRectangleTool *rectangle);
static gboolean gimp_rectangle_tool_scale_has_changed
(GimpRectangleTool *rectangle_tool);
static void gimp_rectangle_tool_get_other_side (GimpRectangleTool *rectangle_tool,
const gchar **other_x,
const gchar **other_y);
@ -540,7 +555,14 @@ gimp_rectangle_tool_control (GimpTool *tool,
case GIMP_TOOL_ACTION_RESUME:
gimp_rectangle_tool_set_highlight (rectangle);
gimp_rectangle_tool_update_handle_sizes (rectangle);
/* When highlightning is on, the shell gets paused/unpaused which means we
* will get here, but we only want to recalculate handle sizes when the
* zoom has changed.
*/
if (gimp_rectangle_tool_scale_has_changed (rectangle))
gimp_rectangle_tool_update_handle_sizes (rectangle);
break;
case GIMP_TOOL_ACTION_HALT:
@ -594,8 +616,6 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
"y2", y,
NULL);
gimp_rectangle_tool_update_handle_sizes (rectangle);
gimp_rectangle_tool_start (rectangle, display);
}
@ -623,6 +643,8 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
"y2", y,
NULL);
gimp_rectangle_tool_update_handle_sizes (rectangle);
gimp_tool_control_set_snap_offsets (tool->control, 0, 0, 0, 0);
break;
@ -1664,6 +1686,32 @@ gimp_rectangle_tool_update_handle_sizes (GimpRectangleTool *rectangle)
CLAMP (private->top_and_bottom_handle_w, MIN_HANDLE_SIZE, G_MAXINT);
private->left_and_right_handle_h =
CLAMP (private->left_and_right_handle_h, MIN_HANDLE_SIZE, G_MAXINT);
private->scale_x_used_for_handle_size_calculations = shell->scale_x;
private->scale_y_used_for_handle_size_calculations = shell->scale_y;
}
/**
* gimp_rectangle_tool_scale_has_changed:
* rectangle_tool: A #GimpRectangleTool.
*
* Returns true if the scale that was used to calculate handle sizes is not the
* same as the current shell scale.
*/
static gboolean
gimp_rectangle_tool_scale_has_changed (GimpRectangleTool *rectangle_tool)
{
GimpTool *tool = GIMP_TOOL (rectangle_tool);
GimpRectangleToolPrivate *private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
GimpDisplayShell *shell;
if (tool->display == NULL)
return TRUE;
shell = GIMP_DISPLAY_SHELL (tool->display->shell);
return shell->scale_x != private->scale_x_used_for_handle_size_calculations ||
shell->scale_y != private->scale_y_used_for_handle_size_calculations;
}
static void
@ -3133,7 +3181,7 @@ gimp_rectangle_tool_update_with_coord (GimpRectangleTool *rectangle_tool,
/**
* gimp_rectangle_tool_get_constraints:
* @rectangle_tool: A #GimpRectagnelTool.
* @rectangle_tool: A #GimpRectangleTool.
* @min_x:
* @min_y:
* @max_x: