From 9d83d77b253fdcce2b3614e3ee21a74a94d4663d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Thu, 11 Jul 2019 18:03:40 +0200 Subject: Pre-Threading comment --- src/live_effects/lpe-powerstroke.cpp | 61 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 29 deletions(-) (limited to 'src/live_effects') diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp index d0f6f1fda..55ef2aaa7 100644 --- a/src/live_effects/lpe-powerstroke.cpp +++ b/src/live_effects/lpe-powerstroke.cpp @@ -215,39 +215,42 @@ LPEPowerStroke::doOnApply(SPLPEItem const* lpeitem) std::vector points; Geom::PathVector const &pathv = pathv_to_linear_and_cubic_beziers(SP_SHAPE(lpeitem)->_curve->get_pathvector()); double width = (lpeitem && lpeitem->style) ? lpeitem->style->stroke_width.computed / 2 : 1.; - - SPCSSAttr *css = sp_repr_css_attr_new (); - if (lpeitem->style) { - if (lpeitem->style->stroke.isPaintserver()) { - SPPaintServer * server = lpeitem->style->getStrokePaintServer(); - if (server) { - Glib::ustring str; - str += "url(#"; - str += server->getId(); - str += ")"; - sp_repr_css_set_property (css, "fill", str.c_str()); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + Glib::ustring pref_path_ps = "/live_effects/powerstroke/powerpencilstyle"; + Glib::ustring pref_path_pp = "/live_effects/powerstroke/powerpencil"; + bool powerpencil = prefs->getBool(pref_path_pp, false); + bool powerpencilstyle = prefs->getBool(pref_path_ps, false); + if (!powerpencilstyle) { + SPCSSAttr *css = sp_repr_css_attr_new (); + if (lpeitem->style) { + if (lpeitem->style->stroke.isPaintserver()) { + SPPaintServer * server = lpeitem->style->getStrokePaintServer(); + if (server) { + Glib::ustring str; + str += "url(#"; + str += server->getId(); + str += ")"; + sp_repr_css_set_property (css, "fill", str.c_str()); + } + } else if (lpeitem->style->stroke.isColor()) { + gchar c[64]; + sp_svg_write_color (c, sizeof(c), lpeitem->style->stroke.value.color.toRGBA32(SP_SCALE24_TO_FLOAT(lpeitem->style->stroke_opacity.value))); + sp_repr_css_set_property (css, "fill", c); + } else { + sp_repr_css_set_property (css, "fill", "none"); } - } else if (lpeitem->style->stroke.isColor()) { - gchar c[64]; - sp_svg_write_color (c, sizeof(c), lpeitem->style->stroke.value.color.toRGBA32(SP_SCALE24_TO_FLOAT(lpeitem->style->stroke_opacity.value))); - sp_repr_css_set_property (css, "fill", c); } else { - sp_repr_css_set_property (css, "fill", "none"); + sp_repr_css_unset_property (css, "fill"); } - } else { - sp_repr_css_unset_property (css, "fill"); - } - sp_repr_css_set_property(css, "fill-rule", "nonzero"); - sp_repr_css_set_property(css, "stroke", "none"); - - sp_desktop_apply_css_recursive(item, css, true); - sp_repr_css_attr_unref (css); - - item->updateRepr(); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - Glib::ustring pref_path_pp = "/live_effects/powerstroke/powerpencil"; - bool powerpencil = prefs->getBool(pref_path_pp, false); + sp_repr_css_set_property(css, "fill-rule", "nonzero"); + sp_repr_css_set_property(css, "stroke", "none"); + + sp_desktop_apply_css_recursive(item, css, true); + sp_repr_css_attr_unref (css); + + item->updateRepr(); + } if (!powerpencil) { if (pathv.empty()) { points.emplace_back(0.2,width ); -- cgit v1.2.3