projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
760c7f3
)
cairo-fsm: Implement dashed lines.
author
Ben Pfaff
<blp@cs.stanford.edu>
Wed, 30 Dec 2020 23:11:28 +0000
(15:11 -0800)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Thu, 31 Dec 2020 00:09:42 +0000
(16:09 -0800)
src/output/cairo-fsm.c
patch
|
blob
|
history
diff --git
a/src/output/cairo-fsm.c
b/src/output/cairo-fsm.c
index 1602aae2893dffe5bca737c1e0168107b1cc99b4..16cf47dec43883b711da0d14cf4fd371f7a1e22a 100644
(file)
--- a/
src/output/cairo-fsm.c
+++ b/
src/output/cairo-fsm.c
@@
-185,8
+185,6
@@
xr_draw_line (struct xr_fsm *xr, int x0, int y0, int x1, int y1, int style,
const struct cell_color *color)
{
cairo_new_path (xr->cairo);
const struct cell_color *color)
{
cairo_new_path (xr->cairo);
- if (!xr->style->use_system_colors)
- xr_set_source_rgba (xr->cairo, color);
cairo_set_line_width (
xr->cairo,
xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2
cairo_set_line_width (
xr->cairo,
xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2
@@
-194,7
+192,14
@@
xr_draw_line (struct xr_fsm *xr, int x0, int y0, int x1, int y1, int style,
: XR_LINE_WIDTH));
cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0));
cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1));
: XR_LINE_WIDTH));
cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0));
cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1));
+
+ if (!xr->style->use_system_colors)
+ xr_set_source_rgba (xr->cairo, color);
+ if (style == RENDER_LINE_DASHED)
+ cairo_set_dash (xr->cairo, (double[]) { 2 }, 1, 0);
cairo_stroke (xr->cairo);
cairo_stroke (xr->cairo);
+ if (style == RENDER_LINE_DASHED)
+ cairo_set_dash (xr->cairo, NULL, 0, 0);
}
static void UNUSED
}
static void UNUSED