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

app: initalize rectangle tool respecting size constrants

Browse Source
This commit is contained in:
Alexia Death
2011-10-01 11:45:11 +03:00
parent 890b9abf94
commit ef7060251c
1 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/tools/gimprectangletool.c
View File

@ -886,17 +886,21 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
GdkModifierType state, GdkModifierType state,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpRectangleTool *rect_tool; GimpRectangleTool *rect_tool;
GimpDrawTool *draw_tool; GimpRectangleOptions *options;
GimpRectangleToolPrivate *private; GimpDrawTool *draw_tool;
gdouble snapped_x, snapped_y; GimpRectangleToolPrivate *private;
gint snap_x, snap_y; GimpRectangleOptionsPrivate *priv_opts;
gdouble snapped_x, snapped_y;
gint snap_x, snap_y;
g_return_if_fail (GIMP_IS_RECTANGLE_TOOL (tool)); g_return_if_fail (GIMP_IS_RECTANGLE_TOOL (tool));
rect_tool = GIMP_RECTANGLE_TOOL (tool); rect_tool = GIMP_RECTANGLE_TOOL (tool);
options = GIMP_RECTANGLE_OPTIONS (tool->tool_info->tool_options);
draw_tool = GIMP_DRAW_TOOL (tool); draw_tool = GIMP_DRAW_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool); private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
priv_opts = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
gimp_draw_tool_pause (draw_tool); gimp_draw_tool_pause (draw_tool);
@ -945,8 +949,33 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
/* Remember that this rectangle was created from scratch. */ /* Remember that this rectangle was created from scratch. */
private->is_new = TRUE; private->is_new = TRUE;
private->x1 = private->x2 = snapped_x; if (gimp_rectangle_options_fixed_rule_active (options,
private->y1 = private->y2 = snapped_y; GIMP_RECTANGLE_TOOL_FIXED_SIZE))
{
private->x1 = snapped_x - priv_opts->desired_fixed_size_width / 2;
private->y1 = snapped_y - priv_opts->desired_fixed_size_height / 2;
private->x2 = snapped_x + priv_opts->desired_fixed_size_width / 2;
private->y2 = snapped_y + priv_opts->desired_fixed_size_height / 2;
}
else if (gimp_rectangle_options_fixed_rule_active (options,
GIMP_RECTANGLE_TOOL_FIXED_WIDTH))
{
private->x1 = snapped_x - priv_opts->desired_fixed_width / 2;
private->x2 = snapped_x + priv_opts->desired_fixed_width / 2;
private->y1 = private->y2 = snapped_y;
}
else if (gimp_rectangle_options_fixed_rule_active (options,
GIMP_RECTANGLE_TOOL_FIXED_HEIGHT))
{
private->y1 = snapped_y - priv_opts->desired_fixed_height / 2;
private->y2 = snapped_y + priv_opts->desired_fixed_height / 2;
private->x1 = private->x2 = snapped_x;
}
else
{
private->x1 = private->x2 = snapped_x;
private->y1 = private->y2 = snapped_y;
}
gimp_rectangle_tool_update_handle_sizes (rect_tool); gimp_rectangle_tool_update_handle_sizes (rect_tool);