diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-31 00:22:23 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-31 00:22:23 +0000 |
| commit | a95976663a5d9ffe10fb39aa03f6ad42b067ae95 (patch) | |
| tree | 73aa5717905b22abcb80d7134dc6fca4eb95c573 /src/widgets/stroke-style.cpp | |
| parent | Update to experimental r13619 (diff) | |
| parent | Fix units.xml (diff) | |
| download | inkscape-a95976663a5d9ffe10fb39aa03f6ad42b067ae95.tar.gz inkscape-a95976663a5d9ffe10fb39aa03f6ad42b067ae95.zip | |
Update to trunk r13648
(bzr r13341.5.19)
Diffstat (limited to 'src/widgets/stroke-style.cpp')
| -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 cb18207f4..02dd5df6e 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); |