r13920 by fschmid - Fixed hang when dropping vector files onto the canvas when there is already a selection.

scribus-commit scribus-commit at lists.scribus.net
Wed Aug 26 11:05:30 CEST 2009


Revision: 13920
Author: fschmid
Date: 2009-08-26T09:04:22.156629Z
Commit message: Fixed hang when dropping vector files onto the canvas when there is already a selection.

Changeset: 
M  /trunk/Scribus/scribus/scribusview.cpp

Diffs:
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 13919)
+++ scribus/scribusview.cpp	(revision 13920)
@@ -935,11 +935,12 @@
 //		int pscx=qRound(e->pos().x()/m_canvas->scale()), pscy=qRound(e->pos().y()/m_canvas->scale());
 		//Loop through all items and see which one(s) were under the drop point on the current layer
 		//Should make a nice function for this.
+		Doc->m_Selection->delaySignalsOn();
 		for (int i=0; i<Doc->Items->count(); ++i)
 		{
 			if (Doc->Items->at(i)->LayerID==Doc->activeLayer())
 			{
-				Doc->m_Selection->delaySignalsOn();
+//				Doc->m_Selection->delaySignalsOn();
 				if (m_canvas->frameHitTest(dropPosDocQ, Doc->Items->at(i)) >= Canvas::INSIDE)
 				{
 					Deselect(false);
@@ -948,9 +949,10 @@
 					selectedItemByDrag=true;
 					break;
 				}
-				Doc->m_Selection->delaySignalsOff();
+//				Doc->m_Selection->delaySignalsOff();
 			}
 		}
+		Doc->m_Selection->delaySignalsOff();
 		bool vectorFile = false;
 		if (fi.exists())
 		{




More information about the scribus-commit mailing list