r23245 by jghali - Fix redoing TextToPath action after having undone it

scribus-commit scribus-commit at lists.scribus.net
Thu Oct 10 05:57:48 UTC 2019


Author: jghali
Date: Thu Oct 10 05:57:48 2019
New Revision: 23245

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23245
Log:
Fix redoing TextToPath action after having undone it

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23245&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Thu Oct 10 05:57:48 2019
@@ -3165,8 +3165,13 @@
 			continue;
 		}
 
+		// We don't need any of the undo actions created by TextToPathPainter. If we did take them into account,
+		// the created items woud reappear when redoing an undone TextToPath action
+		undoManager->setUndoEnabled(false);
 		TextToPathPainter p(this, currItem, newGroupedItems);
 		currItem->textLayout.render(&p);
+		undoManager->setUndoEnabled(true);
+
 		if ((currItem->asPathText()) && (currItem->PoShow))
 		{
 			int z = Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, currItem->xPos(), currItem->yPos(), currItem->width(), currItem->height(), currItem->lineWidth(), CommonStrings::None, currItem->lineColor());




More information about the scribus-commit mailing list