r23813 by jghali - Fix case where pattern display would not be updated correctly after changing color used in pattern

scribus-commit scribus-commit at lists.scribus.net
Sat May 16 16:26:52 UTC 2020


Author: jghali
Date: Sat May 16 16:26:52 2020
New Revision: 23813

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23813
Log:
Fix case where pattern display would not be updated correctly after changing color used in pattern

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23813&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat May 16 16:26:52 2020
@@ -9365,9 +9365,6 @@
 				// Temporary code until LineStyle is effectively used
 				doc->replaceLineStyleColors(dia->replaceColorMap);
 			}
-			doc->recalculateColors();
-			if (doc->useImageColorEffects())
-				doc->recalcPicturesRes(ScribusDoc::RecalcPicRes_ImageWithColorEffectsOnly);
 			doc->setGradients(dia->dialogGradients);
 			if (!dia->replaceMap.isEmpty())
 			{
@@ -9382,6 +9379,9 @@
 				colorrsc.mapPatterns(dia->replaceMapPatterns);
 				doc->replaceNamedResources(colorrsc);
 			}
+			doc->recalculateColors();
+			if (doc->useImageColorEffects())
+				doc->recalcPicturesRes(ScribusDoc::RecalcPicRes_ImageWithColorEffectsOnly);
 			symbolPalette->updateSymbolList();
 			updateColorLists();
 			if (!doc->m_Selection->isEmpty())




More information about the scribus-commit mailing list