From dbe9eae8b96400c233e21d4b47046345ecbea26e Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 28 Feb 2017 23:07:32 +0100 Subject: Makes selection complexity linear in the number of selected objects instead of quadratic due to too many signals sent Fixed bugs: - https://launchpad.net/bugs/1666714 (bzr r15556) --- src/object-set.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/object-set.cpp') diff --git a/src/object-set.cpp b/src/object-set.cpp index 65e7d45d6..8fcb4215e 100644 --- a/src/object-set.cpp +++ b/src/object-set.cpp @@ -20,7 +20,7 @@ namespace Inkscape { -bool ObjectSet::add(SPObject* object) { +bool ObjectSet::add(SPObject* object, bool nosignal) { g_return_val_if_fail(object != NULL, false); g_return_val_if_fail(SP_IS_OBJECT(object), false); @@ -37,7 +37,8 @@ bool ObjectSet::add(SPObject* object) { _removeDescendantsFromSet(object); _add(object); - _emitSignals(); + if (!nosignal) + _emitSignals(); return true; } @@ -246,9 +247,10 @@ void ObjectSet::setReprList(std::vector const &list) { for (auto iter = list.rbegin(); iter != list.rend(); ++iter) { SPObject *obj = document()->getObjectById((*iter)->attribute("id")); if (obj) { - add(obj); + add(obj, true); } } + _emitSignals(); if(dynamic_cast(this)) return dynamic_cast(this)->_emitChanged();// } -- cgit v1.2.3