r16658 by jghali - #6577: deselecting all text doesn't work

scribus-commit scribus-commit at lists.scribus.net
Sun Jun 12 00:31:59 UTC 2011


Author: jghali
Date: Sun Jun 12 00:31:59 2011
New Revision: 16658

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16658
Log:
#6577: deselecting all text doesn't work

Modified:
    branches/Version135/Scribus/scribus/scribus.cpp

Modified: branches/Version135/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16658&path=/branches/Version135/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribus.cpp (original)
+++ branches/Version135/Scribus/scribus/scribus.cpp Sun Jun 12 00:31:59 2011
@@ -5505,7 +5505,23 @@
 
 void ScribusMainWindow::deselectAll()
 {
-	if (view!=NULL)
+	if (doc->appMode == modeEdit)
+	{
+		if (doc->m_Selection->count() <= 0)
+			return;
+		PageItem *currItem = doc->m_Selection->itemAt(0);
+		if (currItem->asTextFrame())
+		{
+			currItem->itemText.deselectAll();
+			doc->regionsChanged()->update(currItem->getBoundingRect());
+		}
+		else
+		{
+			doc->view()->Deselect(true);
+			doc->view()->requestMode(modeNormal);
+		}
+	}
+	else if (view != NULL)
 		view->Deselect(true);
 }
 




More information about the scribus-commit mailing list