libappfw: Redesigned TextDrawable with better multitasking

This new implementation of TextDrawable can cleanly have multiple ongoing wrapping tasks, can be deleted immediately without waiting, and does no questionable copying of front/back wrapping data.
skyjake · Oct 21, 2014 · ee85daf · ee85daf
1 parent 55b0f65
commit ee85daf
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 150 deletions.
diff --git a/doomsday/libappfw/include/de/framework/textdrawable.h b/doomsday/libappfw/include/de/framework/textdrawable.h
@@ -94,7 +94,6 @@ class LIBAPPFW_PUBLIC TextDrawable : public GLTextComposer
 
     Vector2ui wrappedSize() const;
     String text() const;
-    String plainText() const;
     bool isBeingWrapped() const;
     Font const &font() const;
 

diff --git a/doomsday/libappfw/src/gltextcomposer.cpp b/doomsday/libappfw/src/gltextcomposer.cpp
@@ -374,7 +374,11 @@ void GLTextComposer::setAtlas(Atlas &atlas)
 
 void GLTextComposer::setWrapping(FontLineWrapping const &wrappedLines)
 {
-    d->wraps = &wrappedLines;
+    if(d->wraps != &wrappedLines)
+    {
+        d->wraps = &wrappedLines;
+        forceUpdate();
+    }
 }
 
 void GLTextComposer::setText(String const &text)
@@ -410,6 +414,9 @@ bool GLTextComposer::update()
 {
     DENG2_ASSERT(d->wraps != 0);
 
+    // If a font hasn't been defined, there isn't much to do.
+    if(!d->wraps->hasFont()) return false;
+
     if(d->font != &d->wraps->font())
     {
         d->font = &d->wraps->font();