diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-10-19 18:13:08 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-10-19 18:13:08 +0000 |
| commit | 56d3d2d17953c3340f2af4d9504f2ce6cd65e917 (patch) | |
| tree | 37562535345f9bc4cac34dac7de5f7ca1d50e208 /src/widgets | |
| parent | Fix LPE Powerstroke unintuitive / unstable / scale-dependent behavior (diff) | |
| download | inkscape-56d3d2d17953c3340f2af4d9504f2ce6cd65e917.tar.gz inkscape-56d3d2d17953c3340f2af4d9504f2ce6cd65e917.zip | |
Don't set linejoin and linecap type if query is "nothing" (query value is invalid).
(bzr r13628)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/stroke-style.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 9c8d45908..7477e07ca 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -764,7 +764,7 @@ StrokeStyle::setJoinType (unsigned const jointype) break; default: // Should not happen - std::cerr << "StrokeStyle::setJoinType(): Invalid value" << std::endl; + std::cerr << "StrokeStyle::setJoinType(): Invalid value: " << jointype << std::endl; tb = joinMiter; break; } @@ -790,7 +790,7 @@ StrokeStyle::setCapType (unsigned const captype) break; default: // Should not happen - std::cerr << "StrokeStyle::setCapType(): Invalid value" << std::endl; + std::cerr << "StrokeStyle::setCapType(): Invalid value: " << captype << std::endl; tb = capButt; break; } @@ -884,13 +884,15 @@ StrokeStyle::updateLine() miterLimitAdj->set_value(query->stroke_miterlimit.value); // TODO: reflect averagedness? #endif - if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT) { + if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT && + result_join != QUERY_STYLE_NOTHING ) { setJoinType(query->stroke_linejoin.value); } else { setJoinButtons(NULL); } - if (result_cap != QUERY_STYLE_MULTIPLE_DIFFERENT) { + if (result_cap != QUERY_STYLE_MULTIPLE_DIFFERENT && + result_cap != QUERY_STYLE_NOTHING ) { setCapType (query->stroke_linecap.value); } else { setCapButtons(NULL); |