From ba0a43458620f76e235fc9d61539582d7887311f Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Mon, 2 Jan 2017 00:30:14 +0100 Subject: attemt to mirror (bzr r15356.1.11) --- src/live_effects/parameter/item.cpp | 26 ++++++++++++++++---------- src/live_effects/parameter/originalitem.cpp | 15 +++++++++++++++ src/live_effects/parameter/originalitem.h | 2 ++ 3 files changed, 33 insertions(+), 10 deletions(-) (limited to 'src/live_effects/parameter') diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp index 8caea4e26..0a46ec7ce 100644 --- a/src/live_effects/parameter/item.cpp +++ b/src/live_effects/parameter/item.cpp @@ -135,25 +135,31 @@ ItemParam::addCanvasIndicators(SPLPEItem const*/*lpeitem*/, std::vectorconnectDelete(sigc::mem_fun(*this, &ItemParam::linked_delete)); - linked_modified_connection = to->connectModified(sigc::mem_fun(*this, &ItemParam::linked_modified)); - if (SP_IS_ITEM(to)) { - linked_transformed_connection = SP_ITEM(to)->connectTransformed(sigc::mem_fun(*this, &ItemParam::linked_transformed)); + if (!linked_delete_connection.connected() || force) { + std::cout << "111111111111111111\n"; + linked_delete_connection = to->connectDelete(sigc::mem_fun(*this, &ItemParam::linked_delete)); + linked_modified_connection = to->connectModified(sigc::mem_fun(*this, &ItemParam::linked_modified)); + if (SP_IS_ITEM(to)) { + linked_transformed_connection = SP_ITEM(to)->connectTransformed(sigc::mem_fun(*this, &ItemParam::linked_transformed)); + } + linked_modified(to, SP_OBJECT_MODIFIED_FLAG); // simulate linked_modified signal, so that path data is updated } - linked_modified(to, SP_OBJECT_MODIFIED_FLAG); // simulate linked_modified signal, so that path data is updated } void ItemParam::quit_listening(void) { - linked_modified_connection.disconnect(); - linked_delete_connection.disconnect(); - linked_transformed_connection.disconnect(); + if (linked_delete_connection.connected()) { + std::cout << "2222222222222222222222\n"; + linked_modified_connection.disconnect(); + linked_delete_connection.disconnect(); + linked_transformed_connection.disconnect(); + } } void @@ -161,7 +167,7 @@ ItemParam::ref_changed(SPObject */*old_ref*/, SPObject *new_ref) { quit_listening(); if ( new_ref ) { - start_listening(new_ref); + start_listening(new_ref, true); } } diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index 015fa0bd4..dc7f2d634 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -83,6 +83,21 @@ OriginalItemParam::param_newWidget() return dynamic_cast (_widget); } +void +OriginalItemParam::param_start_listening(SPObject * to) +{ + if ( to == NULL ) { + return; + } + start_listening(to, false); +} + +void +OriginalItemParam::param_quit_listening(void) +{ + quit_listening(); +} + void OriginalItemParam::linked_modified_callback(SPObject *linked_obj, guint /*flags*/) { diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h index 9c67571e8..5478a1e4b 100644 --- a/src/live_effects/parameter/originalitem.h +++ b/src/live_effects/parameter/originalitem.h @@ -26,6 +26,8 @@ public: bool linksToItem() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } + void param_start_listening(SPObject * to); + void param_quit_listening(void); virtual Gtk::Widget * param_newWidget(); -- cgit v1.2.3 From 0a19b6fbad1ada089488541e60f195a0943c01a8 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Mon, 2 Jan 2017 13:14:36 +0100 Subject: Fix inverse clone (bzr r15356.1.12) --- src/live_effects/parameter/item.cpp | 26 ++++++++++---------------- src/live_effects/parameter/originalitem.cpp | 21 ++++----------------- src/live_effects/parameter/originalitem.h | 5 ++--- 3 files changed, 16 insertions(+), 36 deletions(-) (limited to 'src/live_effects/parameter') diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp index 0a46ec7ce..8caea4e26 100644 --- a/src/live_effects/parameter/item.cpp +++ b/src/live_effects/parameter/item.cpp @@ -135,31 +135,25 @@ ItemParam::addCanvasIndicators(SPLPEItem const*/*lpeitem*/, std::vectorconnectDelete(sigc::mem_fun(*this, &ItemParam::linked_delete)); - linked_modified_connection = to->connectModified(sigc::mem_fun(*this, &ItemParam::linked_modified)); - if (SP_IS_ITEM(to)) { - linked_transformed_connection = SP_ITEM(to)->connectTransformed(sigc::mem_fun(*this, &ItemParam::linked_transformed)); - } - linked_modified(to, SP_OBJECT_MODIFIED_FLAG); // simulate linked_modified signal, so that path data is updated + linked_delete_connection = to->connectDelete(sigc::mem_fun(*this, &ItemParam::linked_delete)); + linked_modified_connection = to->connectModified(sigc::mem_fun(*this, &ItemParam::linked_modified)); + if (SP_IS_ITEM(to)) { + linked_transformed_connection = SP_ITEM(to)->connectTransformed(sigc::mem_fun(*this, &ItemParam::linked_transformed)); } + linked_modified(to, SP_OBJECT_MODIFIED_FLAG); // simulate linked_modified signal, so that path data is updated } void ItemParam::quit_listening(void) { - if (linked_delete_connection.connected()) { - std::cout << "2222222222222222222222\n"; - linked_modified_connection.disconnect(); - linked_delete_connection.disconnect(); - linked_transformed_connection.disconnect(); - } + linked_modified_connection.disconnect(); + linked_delete_connection.disconnect(); + linked_transformed_connection.disconnect(); } void @@ -167,7 +161,7 @@ ItemParam::ref_changed(SPObject */*old_ref*/, SPObject *new_ref) { quit_listening(); if ( new_ref ) { - start_listening(new_ref, true); + start_listening(new_ref); } } diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index dc7f2d634..053062128 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -83,26 +83,13 @@ OriginalItemParam::param_newWidget() return dynamic_cast (_widget); } -void -OriginalItemParam::param_start_listening(SPObject * to) -{ - if ( to == NULL ) { - return; - } - start_listening(to, false); -} - -void -OriginalItemParam::param_quit_listening(void) -{ - quit_listening(); -} - void OriginalItemParam::linked_modified_callback(SPObject *linked_obj, guint /*flags*/) { - emit_changed(); - SP_OBJECT(param_effect->getLPEObj())->requestModified(SP_OBJECT_MODIFIED_FLAG); + if (!inverse) { + emit_changed(); + SP_OBJECT(param_effect->getLPEObj())->requestModified(SP_OBJECT_MODIFIED_FLAG); + } } void diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h index 5478a1e4b..58d04e05a 100644 --- a/src/live_effects/parameter/originalitem.h +++ b/src/live_effects/parameter/originalitem.h @@ -23,11 +23,9 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect); virtual ~OriginalItemParam(); - + void setInverse(bool inversed) { inverse = inversed; } bool linksToItem() const { return (href != NULL); } SPItem * getObject() const { return ref.getObject(); } - void param_start_listening(SPObject * to); - void param_quit_listening(void); virtual Gtk::Widget * param_newWidget(); @@ -38,6 +36,7 @@ protected: void on_select_original_button_click(); private: + bool inverse; OriginalItemParam(const OriginalItemParam&); OriginalItemParam& operator=(const OriginalItemParam&); }; -- cgit v1.2.3