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

app: add gimp_transform_options_show_preview() 

which returns whether or not to show a transform preview. Also clean
up gimp_transform_tool_draw() a bit and add a stroke group for the
center handle.
This commit is contained in:
Michael Natterer 2011-03-27 21:49:34 +02:00
parent 8a09fd1f34
commit caa8cdd4c1
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/tools/gimptransformoptions.c
View File

@ -386,6 +386,17 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
return vbox;
}
gboolean
gimp_transform_options_show_preview (GimpTransformOptions *options)
{
g_return_val_if_fail (GIMP_IS_TRANSFORM_OPTIONS (options), FALSE);
return ((options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_IMAGE ||
options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_IMAGE_GRID) &&
options->type == GIMP_TRANSFORM_TYPE_LAYER &&
options->direction == GIMP_TRANSFORM_FORWARD);
}
/* private functions */

6
app/tools/gimptransformoptions.h
View File

@ -50,9 +50,11 @@ struct _GimpTransformOptions
};
GType gimp_transform_options_get_type (void) G_GNUC_CONST;
GType gimp_transform_options_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_transform_options_gui (GimpToolOptions *tool_options);
GtkWidget * gimp_transform_options_gui (GimpToolOptions *tool_options);
gboolean gimp_transform_options_show_preview (GimpTransformOptions *options);
#endif /* __GIMP_TRANSFORM_OPTIONS_H__ */

48
app/tools/gimptransformtool.c
View File

@ -750,31 +750,28 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (draw_tool);
GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
GimpImage *image = gimp_display_get_image (tool->display);
gdouble z1, z2, z3, z4;
if ((options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_IMAGE ||
options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_IMAGE_GRID) &&
options->type == GIMP_TRANSFORM_TYPE_LAYER &&
options->direction == GIMP_TRANSFORM_FORWARD)
{
GimpCanvasItem *item;
item = gimp_canvas_transform_preview_new (gimp_display_get_shell (draw_tool->display),
tool->drawable,
&tr_tool->transform,
tr_tool->x1,
tr_tool->y1,
tr_tool->x2,
tr_tool->y2,
GIMP_IS_PERSPECTIVE_TOOL (tr_tool),
options->preview_opacity);
gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
}
if (tr_tool->use_grid)
{
GimpCanvasGroup *stroke_group;
gdouble z1, z2, z3, z4;
if (gimp_transform_options_show_preview (options))
{
GimpCanvasItem *item;
item = gimp_canvas_transform_preview_new (gimp_display_get_shell (draw_tool->display),
tool->drawable,
&tr_tool->transform,
tr_tool->x1,
tr_tool->y1,
tr_tool->x2,
tr_tool->y2,
GIMP_IS_PERSPECTIVE_TOOL (tr_tool),
options->preview_opacity);
gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
}
stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
@ -906,7 +903,12 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
/* draw the center */
if (tr_tool->use_center)
{
gint d = MIN (tr_tool->handle_w, tr_tool->handle_h);
GimpCanvasGroup *stroke_group;
gint d = MIN (tr_tool->handle_w, tr_tool->handle_h);
stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
gimp_draw_tool_push_group (draw_tool, stroke_group);
gimp_draw_tool_add_handle (draw_tool,
GIMP_HANDLE_CIRCLE,
@ -918,6 +920,8 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
tr_tool->tcx, tr_tool->tcy,
d, d,
GIMP_HANDLE_ANCHOR_CENTER);
gimp_draw_tool_pop_group (draw_tool);
}
if (options->type == GIMP_TRANSFORM_TYPE_SELECTION)