r21648 by jghali - #14462: Shadow color needs to be collected with named resources

[scribus-commit]

Author: jghali
Date: Tue Dec 13 16:58:06 2016
New Revision: 21648

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21648
Log:
#14462: Shadow color needs to be collected with named resources

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21648&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Tue Dec 13 16:58:06 2016
@@ -8497,6 +8497,9 @@
 
 void PageItem::getNamedResources(ResourceCollection& lists) const
 {
+	if (hasSoftShadow())
+		lists.collectColor(softShadowColor());
+
 	if (GrType == 0)
 		lists.collectColor(fillColor());
 	else if ((GrType < 8) || (GrType == 10))

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21648&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Tue Dec 13 16:58:06 2016
@@ -677,31 +677,31 @@
 
 	// soft shadow
 	void setHasSoftShadow(bool val);
-	bool hasSoftShadow() { return m_hasSoftShadow; }
+	bool hasSoftShadow() const { return m_hasSoftShadow; }
 
 	void setSoftShadowColor(const QString &val);
-	QString softShadowColor() { return m_softShadowColor; }
+	QString softShadowColor() const { return m_softShadowColor; }
 
 	void setSoftShadowShade(int val);
-	int softShadowShade() { return m_softShadowShade; }
+	int softShadowShade() const { return m_softShadowShade; }
 
 	void setSoftShadowBlurRadius(double val);
-	double softShadowBlurRadius() { return m_softShadowBlurRadius; }
+	double softShadowBlurRadius() const { return m_softShadowBlurRadius; }
 
 	void setSoftShadowXOffset(double val);
-	double softShadowXOffset() { return m_softShadowXOffset; }
+	double softShadowXOffset() const { return m_softShadowXOffset; }
 
 	void setSoftShadowYOffset(double val);
-	double softShadowYOffset() { return m_softShadowYOffset; }
+	double softShadowYOffset() const { return m_softShadowYOffset; }
 
 	void setSoftShadowOpacity(double val);
-	double softShadowOpacity() { return m_softShadowOpacity; }
+	double softShadowOpacity() const { return m_softShadowOpacity; }
 
 	void setSoftShadowBlendMode(int val);
-	double softShadowBlendMode() { return m_softShadowBlendMode; }
+	double softShadowBlendMode() const { return m_softShadowBlendMode; }
 
 	void setSoftShadowErasedByObject(bool val);
-	bool softShadowErasedByObject() { return m_softShadowErasedByObject; }
+	bool softShadowErasedByObject() const { return m_softShadowErasedByObject; }
 
 	void setSoftShadowHasObjectTransparency(bool val);
 	bool softShadowHasObjectTransparency() { return m_softShadowHasObjectTransparency; }