summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFelipe Corr??a da Silva Sanches <juca@members.fsf.org>2011-06-01 00:15:11 +0000
committerFelipe C. da S. Sanches <juca@members.fsf.org>2011-06-01 00:15:11 +0000
commit50f0c3735473690f71df9862c5d9675f9efcfa8c (patch)
treefa04e91377b20cf9cbf1007d31568823901191fe /src
parentAdd shebang to voronoi.py. Install *.js extensions as non-executable (diff)
downloadinkscape-50f0c3735473690f71df9862c5d9675f9efcfa8c.tar.gz
inkscape-50f0c3735473690f71df9862c5d9675f9efcfa8c.zip
fix rendering of angled guidelines
(bzr r10246)
Diffstat (limited to 'src')
-rw-r--r--src/display/guideline.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index dddf1f30e..abfec250f 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -170,6 +170,13 @@ static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf)
}
} else {
+
+ if (gl->label){
+ cairo_move_to(ctx, px - buf->rect.x0 + 5, py - buf->rect.y0);
+ cairo_rotate(ctx, atan2(gl->normal_to_line[Geom::X], gl->normal_to_line[Geom::Y]));
+ cairo_show_text(ctx, gl->label);
+ }
+
// render angled line, once intersection has been detected, draw from there.
Geom::Point parallel_to_line( gl->normal_to_line[Geom::Y],
/*should be minus, but inverted y axis*/ gl->normal_to_line[Geom::X]);
@@ -207,12 +214,6 @@ static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf)
sp_guideline_drawline (buf, static_cast<gint>(round(x_intersect_bottom)), buf->rect.y1, static_cast<gint>(round(x_intersect_top)), buf->rect.y0, gl->rgba);
return;
}
-
- if (gl->label){
- cairo_move_to(ctx, px - buf->rect.x0 + 5, py - buf->rect.y0);
- cairo_rotate(ctx, atan2(gl->normal_to_line[Geom::X], gl->normal_to_line[Geom::Y]));
- cairo_show_text(ctx, gl->label);
- }
}
}