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

app: add gimp_cairo_add_segments() 

which adds an array of GdkSegments to the current path, and use it in
gimpdisplayshell-draw.c instead of duplicating the code three times.
This commit is contained in:
Michael Natterer 2010-08-27 14:58:43 +02:00
parent f4f1c563a2
commit f260cd766e
3 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/display/gimpdisplayshell-draw.c
View File

@ -43,6 +43,7 @@
#include "vectors/gimpstroke.h"
#include "vectors/gimpvectors.h"
#include "widgets/gimpcairo.h"
#include "widgets/gimpwidgets-utils.h"
#include "gimpcanvas.h"
@ -540,8 +541,6 @@ gimp_display_shell_draw_layer_boundary (GimpDisplayShell *shell,
GdkSegment *segs,
gint n_segs)
{
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (cr != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
@ -549,20 +548,7 @@ gimp_display_shell_draw_layer_boundary (GimpDisplayShell *shell,
gimp_display_shell_set_layer_style (shell, cr, drawable);
for (i = 0; i < n_segs; i++)
{
if (segs[i].x1 == segs[i].x2)
{
cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1);
cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2);
}
else
{
cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5);
cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5);
}
}
gimp_cairo_add_segments (cr, segs, n_segs);
cairo_stroke (cr);
}
@ -572,28 +558,13 @@ gimp_display_shell_draw_selection_out (GimpDisplayShell *shell,
GdkSegment *segs,
gint n_segs)
{
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (cr != NULL);
g_return_if_fail (segs != NULL && n_segs > 0);
gimp_display_shell_set_selection_out_style (shell, cr);
for (i = 0; i < n_segs; i++)
{
if (segs[i].x1 == segs[i].x2)
{
cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1);
cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2);
}
else
{
cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5);
cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5);
}
}
gimp_cairo_add_segments (cr, segs, n_segs);
cairo_stroke (cr);
}
@ -603,28 +574,13 @@ gimp_display_shell_draw_selection_segments (GimpDisplayShell *shell,
GdkSegment *segs,
gint n_segs)
{
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (cr != NULL);
g_return_if_fail (segs != NULL && n_segs > 0);
cairo_set_line_width (cr, 1.0);
for (i = 0; i < n_segs; i++)
{
if (segs[i].x1 == segs[i].x2)
{
cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1);
cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2);
}
else
{
cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5);
cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5);
}
}
gimp_cairo_add_segments (cr, segs, n_segs);
cairo_stroke (cr);
}

25
app/widgets/gimpcairo.c
View File

@ -84,3 +84,28 @@ gimp_cairo_stipple_pattern_create (const GimpRGB *fg,
return pattern;
}
void
gimp_cairo_add_segments (cairo_t *cr,
GdkSegment *segs,
gint n_segs)
{
gint i;
g_return_if_fail (cr != NULL);
g_return_if_fail (segs != NULL && n_segs > 0);
for (i = 0; i < n_segs; i++)
{
if (segs[i].x1 == segs[i].x2)
{
cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1);
cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2);
}
else
{
cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5);
cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5);
}
}
}

4
app/widgets/gimpcairo.h
View File

@ -29,5 +29,9 @@ cairo_pattern_t * gimp_cairo_stipple_pattern_create (const GimpRGB *fg,
const GimpRGB *bg,
gint index);
void gimp_cairo_add_segments (cairo_t *cr,
GdkSegment *segs,
gint n_segs);
#endif /* __GIMP_CAIRO_H__ */