Refactor|Client: GLTextComposer is an Asset

doomsday/client/include/ui/widgets/gltextcomposer.h

@@ -34,7 +34,7 @@
  * Relies on a pre-existing FontLineWrapping where the text content has been
  * wrapped onto multiple lines and laid out appropriately.
  */
-class GLTextComposer
+class GLTextComposer : public de::Asset
 {
 public:
     typedef de::Vertex2TexRgba    Vertex;
@@ -53,7 +53,8 @@ class GLTextComposer
 
     /**
      * Makes sure all the lines are allocated on the atlas. After this all the
-     * allocated lines match the ones in the wrapping.
+     * allocated lines match the ones in the wrapping. This must be called
+     * before makeVertices().
      *
      * @return @c true, if any allocations were changed and makeVertices()
      * should be called again.

doomsday/client/src/ui/widgets/gltextcomposer.cpp

@@ -130,6 +130,7 @@ GLTextComposer::GLTextComposer() : d(new Instance(this))
 void GLTextComposer::release()
 {
     d->releaseLines();
+    setState(false);
 }
 
 void GLTextComposer::setAtlas(Atlas &atlas)
@@ -152,13 +153,15 @@ void GLTextComposer::setStyledText(const String &styledText)
     d->format.clear();
     d->text = d->format.initFromStyledText(styledText);
     d->needRaster = true;
+    setState(false);
 }
 
 void GLTextComposer::setText(String const &text, Font::RichFormat const &format)
 {
     d->text = text;
     d->format = format;
     d->needRaster = true; // Force a redo of everything.
+    setState(false);
 }
 
 bool GLTextComposer::update()
@@ -175,6 +178,9 @@ bool GLTextComposer::update()
         d->releaseLines();
         d->needRaster = false;
     }
+
+    setState(true);
+
     return d->allocLines();
 }
 
@@ -192,6 +198,8 @@ void GLTextComposer::makeVertices(Vertices &triStrip,
                                   Alignment const &lineAlign,
                                   Vector4f const &color)
 {
+    if(!isReady()) return;
+
     DENG2_ASSERT(d->wraps != 0);
     DENG2_ASSERT(d->font != 0);