Fixed|libappfw: De- and re-initializing procedural images

skyjake · Feb 2, 2014 · 43549b1 · 43549b1
1 parent 32599f0
commit 43549b1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/doomsday/libappfw/include/de/framework/atlasproceduralimage.h b/doomsday/libappfw/include/de/framework/atlasproceduralimage.h
@@ -88,6 +88,11 @@ class LIBAPPFW_PUBLIC AtlasProceduralImage : public ProceduralImage
         }
     }
 
+    void glInit()
+    {
+        alloc();
+    }
+
     void glDeinit()
     {
         release();

diff --git a/doomsday/libappfw/include/de/framework/proceduralimage.h b/doomsday/libappfw/include/de/framework/proceduralimage.h
@@ -50,6 +50,7 @@ class LIBAPPFW_PUBLIC ProceduralImage
     void setColor(Color const &color);
 
     virtual void update();
+    virtual void glInit();
     virtual void glDeinit();
     virtual void glMakeGeometry(DefaultVertexBuf::Builder &verts, Rectanglef const &rect) = 0;
 

diff --git a/doomsday/libappfw/src/proceduralimage.cpp b/doomsday/libappfw/src/proceduralimage.cpp
@@ -51,6 +51,11 @@ void ProceduralImage::update()
     // optional for derived classes
 }
 
+void ProceduralImage::glInit()
+{
+    // optional for derived classes
+}
+
 void ProceduralImage::glDeinit()
 {
     // optional for derived classes

diff --git a/doomsday/libappfw/src/widgets/labelwidget.cpp b/doomsday/libappfw/src/widgets/labelwidget.cpp
@@ -181,6 +181,11 @@ public Font::RichFormat::IStyle
                 << uMvpMatrix << uColor << uAtlas();
 
         glText.init(atlas(), self.font(), this);
+
+        if(!image.isNull())
+        {
+            image->glInit();
+        }
     }
 
     void glDeinit()