r23000 by jghali - #15703: "None" color value is R:153, G:102, B:51

scribus-commit scribus-commit at lists.scribus.net
Tue Jun 4 17:58:09 UTC 2019


Author: jghali
Date: Tue Jun  4 17:58:09 2019
New Revision: 23000

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23000
Log:
#15703: "None" color value is R:153, G:102, B:51

Modified:
    trunk/Scribus/scribus/ui/colorlistmodel.cpp

Modified: trunk/Scribus/scribus/ui/colorlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23000&path=/trunk/Scribus/scribus/ui/colorlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.cpp	Tue Jun  4 17:58:09 2019
@@ -50,6 +50,8 @@
 	if (role == Qt::ToolTipRole)
 	{
 		const ScColor& color = pColorValue->m_color;
+		if (pColorValue->m_name == CommonStrings::None)
+			return QVariant();
 		if (color.getColorModel() == colorModelRGB)
 		{
 			int r, g, b;




More information about the scribus-commit mailing list