diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2006-05-13 21:07:48 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2006-05-13 21:07:48 +0000 |
| commit | 724f9656c1736189f82900a8d5a5b30ebb5af115 (patch) | |
| tree | 1110ccf02098911cdb1b5cd3217b5ad183717470 /src/dyna-draw-context.cpp | |
| parent | added packaging/win32/italian.nsh and czech.nsh to distribution (diff) | |
| download | inkscape-724f9656c1736189f82900a8d5a5b30ebb5af115.tar.gz inkscape-724f9656c1736189f82900a8d5a5b30ebb5af115.zip | |
Calligraphy tool now draws in the last used color or tool style depending on the preferences setting.
(bzr r823)
Diffstat (limited to 'src/dyna-draw-context.cpp')
| -rw-r--r-- | src/dyna-draw-context.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 05e445086..99cea177b 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -45,6 +45,7 @@ #include "xml/repr.h" #include "context-fns.h" #include "sp-item.h" +#include "inkscape.h" #define DDC_RED_RGBA 0xff0000ff @@ -800,7 +801,9 @@ fit_and_split_calligraphics(SPDynaDrawContext *dc, gboolean release) SPCurve *curve = sp_curve_copy(dc->currentcurve); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH (cbp), curve); sp_curve_unref(curve); - sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cbp), 0x000000ff, SP_WIND_RULE_EVENODD); + guint32 fillColor = sp_desktop_get_color_tool(SP_ACTIVE_DESKTOP, "tools.calligraphic", true); + sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cbp), fillColor , SP_WIND_RULE_EVENODD); + sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cbp), 0x00000000, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* fixme: Cannot we cascade it to root more clearly? */ g_signal_connect(G_OBJECT(cbp), "event", G_CALLBACK(sp_desktop_root_handler), SP_EVENT_CONTEXT(dc)->desktop); |