Widgets|Fixed: Label images sometimes not initialized

ProceduralImage instances were only GL-initialized if they were set before the widget itself was initialized.
skyjake · Jan 21, 2017 · a88c946 · a88c946
1 parent 95abe8e
commit a88c946
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/framework/atlasproceduralimage.h b/doomsday/sdk/libappfw/include/de/framework/atlasproceduralimage.h
@@ -39,7 +39,7 @@ class LIBAPPFW_PUBLIC AtlasProceduralImage : public ProceduralImage
 {
 public:
     AtlasProceduralImage(GuiWidget &owner)
-        : _owner(owner), _atlas(0), _needUpdate(false)
+        : _owner(owner), _atlas(0), _id(Id::None), _needUpdate(false)
     {}
 
     ~AtlasProceduralImage()
@@ -71,6 +71,7 @@ class LIBAPPFW_PUBLIC AtlasProceduralImage : public ProceduralImage
         {
             _atlas->release(_id);
             _atlas = 0;
+            _id = Id::None;
         }
     }
 
@@ -94,7 +95,10 @@ class LIBAPPFW_PUBLIC AtlasProceduralImage : public ProceduralImage
 
     void glInit()
     {
-        alloc();
+        if (_id.isNone())
+        {
+            alloc();
+        }
     }
 
     void glDeinit()

diff --git a/doomsday/sdk/libappfw/include/de/framework/proceduralimage.h b/doomsday/sdk/libappfw/include/de/framework/proceduralimage.h
@@ -59,7 +59,7 @@ class LIBAPPFW_PUBLIC ProceduralImage
      */
     virtual bool update();
 
-    virtual void glInit();
+    virtual void glInit(); // called repeatedly
     virtual void glDeinit();
     virtual void glMakeGeometry(DefaultVertexBuf::Builder &verts, Rectanglef const &rect) = 0;
 

diff --git a/doomsday/sdk/libappfw/include/de/framework/styleproceduralimage.h b/doomsday/sdk/libappfw/include/de/framework/styleproceduralimage.h
@@ -71,7 +71,10 @@ class StyleProceduralImage : public ProceduralImage
 
     void glInit()
     {
-        alloc();
+        if (_id.isNone())
+        {
+            alloc();
+        }
     }
 
     void glDeinit()

diff --git a/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
@@ -607,7 +607,7 @@ void LabelWidget::setImage(Image const &image)
     {
         AtlasProceduralImage *proc = new AtlasProceduralImage(*this);
         proc->setImage(image);
-        d->image.reset(proc);
+        setImage(proc);
     }
     else
     {
@@ -798,6 +798,7 @@ void LabelWidget::update()
 
     if (isInitialized())
     {
+        if (d->image) d->image->glInit();
         d->updateGeometry();
     }
     d->updateAppearanceAnimation();

diff --git a/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp
@@ -67,7 +67,10 @@ DENG_GUI_PIMPL(PopupMenuWidget)
 
         void glInit()
         {
-            alloc();
+            if (_id.isNone())
+            {
+                alloc();
+            }
         }
 
         void glDeinit()