[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 11636224ec6634bccb6f75feaf7b514f43086580

[Eugeniy Meshcheryakov]

The branch, master has been updated
       via  11636224ec6634bccb6f75feaf7b514f43086580 (commit)
      from  716be40324676b3a67c836b44e051010800c04a1 (commit)


- Shortlog ------------------------------------------------------------
1163622 handle embedded references too

Summary of changes:
 gui/glyphgraphics.cxx |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 11636224ec6634bccb6f75feaf7b514f43086580
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Wed Sep 12 17:06:05 2007 +0200

    handle embedded references too

diff --git a/gui/glyphgraphics.cxx b/gui/glyphgraphics.cxx
index f758127..7a4d7f3 100644
--- a/gui/glyphgraphics.cxx
+++ b/gui/glyphgraphics.cxx
@@ -50,7 +50,7 @@ GlyphGraphics::GlyphGraphics(GlyphCell *parent, GlyphsModel *model, const QModel
 			// TODO make it useable
 			Q_ASSERT(v.canConvert<GlyphRef>());
 			GlyphRef ref = v.value<GlyphRef>();
-			QModelIndex other = model->findGlyphByName(ref.glyphName());
+			QModelIndex other = m_model->findGlyphByName(ref.glyphName());
 			if (other.isValid()) {
 				new GlyphGraphics(this, other, ref.offset());
 				// TODO account them
@@ -70,6 +70,21 @@ GlyphGraphics::GlyphGraphics(GlyphGraphics *parent, const QModelIndex &idx, cons
 	Q_ASSERT(p);
 	Q_ASSERT(m_model);
 	item = new GlyphItemOutline(this, parent->item);
+	for (int i = 0; i < glyph()->content.size(); i++) {
+		const QVariant &v = glyph()->content.at(i);
+		// TODO add references
+		if (v.canConvert<GlyphRef>()) {
+			// TODO make it useable
+			Q_ASSERT(v.canConvert<GlyphRef>());
+			GlyphRef ref = v.value<GlyphRef>();
+			QModelIndex other = m_model->findGlyphByName(ref.glyphName());
+			if (other.isValid()) {
+				new GlyphGraphics(this, other, ref.offset());
+				// TODO account them
+			}
+		}
+	}
+
 	item->setPos(pos.x(), -pos.y());
 	connect(m_model, SIGNAL(glyphOutlineChanged(QModelIndex)),
 			this, SLOT(glyphOutlineChanged(QModelIndex)));

-- 
Fondue Font Editor