r18720 by fschmid - Fixed Bug #11951: Arbitrary green 'Snap to Items' lines appear when moving a group

[scribus-commit]

Author: fschmid
Date: Sun Jan 12 21:56:20 2014
New Revision: 18720

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18720
Log:
Fixed Bug #11951: Arbitrary green 'Snap to Items' lines appear when moving a group

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18720&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Jan 12 21:56:20 2014
@@ -13969,9 +13969,14 @@
 	QMap<double, uint> tmpGuidesSel;
 	double viewScale=m_View->scale();
 	QList<PageItem*> item = getAllItems(*Items);
+	PageItem *parentI = NULL;
+	if (m_Selection->count() > 0)
+		parentI = m_Selection->itemAt(0)->Parent;
 	for(int i=0;i<item.size();i++)
 	{
 		if(m_Selection->containsItem(item.at(i)) || item.at(i)->OwnPage != OnPage(xin,yin))
+			continue;
+		else if (item.at(i)->Parent != parentI)
 			continue;
 		else if (fabs(item.at(i)->yPos() - yin) < (prefsData().guidesPrefs.guideRad / viewScale))
 			tmpGuidesSel.insert(fabs(item.at(i)->yPos() - yin), i*3);
@@ -13994,6 +13999,8 @@
 	for(int i=0;i<item.size();i++)
 	{
 		if(m_Selection->containsItem(item.at(i)) || item.at(i)->OwnPage != OnPage(xin,yin))
+			continue;
+		else if (item.at(i)->Parent != parentI)
 			continue;
 		else if (fabs(item.at(i)->xPos() - xin) < (prefsData().guidesPrefs.guideRad / viewScale))
 			tmpGuidesSel.insert(fabs(item.at(i)->xPos() - xin), i*3);