[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 2de8387a2291b3e226abeb7fa57898200576f589

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 2de8387a2291b3e226abeb7fa57898200576f589
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Aug 12 17:13:50 2008 +0200

    fix invalid color handling in GlyphsModel
    
    Qt started to return #000000 for invalid color, this
    broke GlyphsModel.

diff --git a/gui/glyphsmodel.cxx b/gui/glyphsmodel.cxx
index 7acfe85..f5c33c0 100644
--- a/gui/glyphsmodel.cxx
+++ b/gui/glyphsmodel.cxx
@@ -107,7 +107,10 @@ bool GlyphsModel::setData(const QModelIndex &index, const QVariant &value, int r
 			ret = glyph->setGlyphName(value.toString());
 			break;
 		case ColorColumn:
-			glyph->setColorString(value.toString());
+			if (qVariantValue<QColor>(value).isValid())
+				glyph->setColorString(value.toString());
+			else
+				glyph->setColorString(QString());
 			break;
 		case UnicodeColumn:
 			ret = glyph->setUnicode(value.toInt());

-- 
Fondue Font Editor