diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index dc1ec1c7e2f7b8623c3aaa6a0325ac0e1660dc5b..44ad9dc9e9cf32addeff77e79348da8bfe0abffd 100644 (file)
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
#include "sp-object.h"
#include "sp-item.h"
+#include "sp-lpe-item.h"
#include "live_effects/lpeobject.h"
#include "selection.h"
#include "desktop.h"
this->nodepath = NULL;
this->knotholder = NULL;
this->hit = false;
- this->listener_attached_for = NULL;
+ this->knotholder_listener_attached_for = NULL;
+ this->nodepath_listener_attached_for = NULL;
}
ShapeEditor::~ShapeEditor() {
case SH_NODEPATH:
if (this->nodepath) {
old_repr = this->nodepath->repr;
- if (old_repr && old_repr == listener_attached_for) {
+ if (old_repr && old_repr == nodepath_listener_attached_for) {
sp_repr_remove_listener_by_data(old_repr, this);
Inkscape::GC::release(old_repr);
- listener_attached_for = NULL;
+ nodepath_listener_attached_for = NULL;
}
this->grab_node = -1;
case SH_KNOTHOLDER:
if (this->knotholder) {
old_repr = this->knotholder->repr;
- if (old_repr && old_repr == listener_attached_for) {
+ if (old_repr && old_repr == knotholder_listener_attached_for) {
sp_repr_remove_listener_by_data(old_repr, this);
Inkscape::GC::release(old_repr);
- listener_attached_for = NULL;
+ knotholder_listener_attached_for = NULL;
}
if (!keep_knotholder) {
@@ -256,10 +258,10 @@ void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
// setting new listener
repr = SP_OBJECT_REPR(item);
- if (repr != listener_attached_for) {
+ if (repr != nodepath_listener_attached_for) {
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- listener_attached_for = repr;
+ nodepath_listener_attached_for = repr;
}
}
break;
@@ -273,10 +275,10 @@ void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
this->knotholder->update_knots();
// setting new listener
repr = this->knotholder->repr;
- if (repr != listener_attached_for) {
+ if (repr != knotholder_listener_attached_for) {
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- listener_attached_for = repr;
+ knotholder_listener_attached_for = repr;
}
}
break;
@@ -303,10 +305,10 @@ void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, LivePathEffectObject
// setting new listener
Inkscape::XML::Node *repr = SP_OBJECT_REPR(lpeobject);
- if (repr && repr != listener_attached_for) {
+ if (repr && repr != nodepath_listener_attached_for) {
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- listener_attached_for = repr;
+ nodepath_listener_attached_for = repr;
}
}
}
@@ -317,9 +319,6 @@ void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, LivePathEffectObject
Why not make a reload function in NodePath and in KnotHolder? */
void ShapeEditor::reset_item (SubType type, bool keep_knotholder)
{
- /// note that it is not certain that this is an SPItem; it could be a LivePathEffectObject.
- SPObject *obj = sp_desktop_document(desktop)->getObjectByRepr(listener_attached_for);
-
switch (type) {
case SH_NODEPATH:
if ( (nodepath) && (IS_LIVEPATHEFFECT(nodepath->object)) ) {
set_item_lpe_path_parameter(nodepath->item, LIVEPATHEFFECT(nodepath->object), key); // the above checks for nodepath, so it is indeed a path that we are editing
g_free(key);
} else {
+ SPObject *obj = sp_desktop_document(desktop)->getObjectByRepr(nodepath_listener_attached_for); /// note that it is not certain that this is an SPItem; it could be a LivePathEffectObject.
set_item(SP_ITEM(obj), SH_NODEPATH);
}
break;
case SH_KNOTHOLDER:
- if (this->knotholder) {
+ if ( knotholder ) {
+ SPObject *obj = sp_desktop_document(desktop)->getObjectByRepr(knotholder_listener_attached_for); /// note that it is not certain that this is an SPItem; it could be a LivePathEffectObject.
set_item(SP_ITEM(obj), SH_KNOTHOLDER, keep_knotholder);
}
break;
const SPItem *item = get_item(SH_NODEPATH);
+ if (!item || !SP_IS_ITEM(item))
+ return false;
+
//Translate click point into proper coord system
this->curvepoint_doc = desktop->w2d(event_p);
this->curvepoint_doc *= sp_item_dt2i_affine(item);