diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 12:24:30 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 12:24:30 +0000 |
| commit | cb312127f49aae8d0f936743ce864a8e9143f558 (patch) | |
| tree | c08a21584aa728f805be98a0c35891fe54d0e608 /src/ui/shape-editor.cpp | |
| parent | Merge https://gitlab.com/inkscape/inkscape into selectable-knots (diff) | |
| download | inkscape-cb312127f49aae8d0f936743ce864a8e9143f558.tar.gz inkscape-cb312127f49aae8d0f936743ce864a8e9143f558.zip | |
Finish add selectable knot shapes
Diffstat (limited to '')
| -rw-r--r-- | src/ui/shape-editor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp index 288c6dc5e..51ea959cd 100644 --- a/src/ui/shape-editor.cpp +++ b/src/ui/shape-editor.cpp @@ -97,11 +97,11 @@ void ShapeEditor::event_attr_changed(Inkscape::XML::Node * node, gchar const *na // this can happen if an LPEItem's knotholder handle was dragged, in which case we want // to keep the knotholder; in all other cases (e.g., if the LPE itself changes) we delete it sh->reset_item(!strcmp(name, "d") || - !strcmp(node->name(),"svg:rect") );//|| -// !strcmp(node->name(),"svg:star") || -// !strcmp(node->name(),"svg:spiral") || -// !strcmp(node->name(),"svg:ellipse") || -// SP_IS_GENERICELLIPSE(SP_ACTIVE_DOCUMENT->getObjectById(node->attribute("id")))); + !strcmp(node->name(),"svg:rect") || + !strcmp(node->name(),"svg:star") | + !strcmp(node->name(),"svg:spiral") || + !strcmp(node->name(),"svg:ellipse") || + SP_IS_GENERICELLIPSE(SP_ACTIVE_DOCUMENT->getObjectById(node->attribute("id")))); } } } @@ -119,7 +119,6 @@ void ShapeEditor::set_item(SPItem *item, bool keep_knotholder) { if (_blockSetItem) { return; } - // this happens (and should only happen) when for an LPEItem having both knotholder and // nodepath the knotholder is adapted; in this case we don't want to delete the knotholder // since this freezes the handles @@ -162,6 +161,7 @@ bool ShapeEditor::knot_mouseover() const { if (this->knotholder) { return knotholder->knot_mouseover(); } + return false; } |
