Refactor|Widgets|libappfw: Collecting pending assets

skyjake · Feb 7, 2017 · 485427c · 485427c
1 parent efb0910
commit 485427c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/framework/guiwidget.h b/doomsday/sdk/libappfw/include/de/framework/guiwidget.h
@@ -501,6 +501,8 @@ public slots:
      */
     static void recycleTrashedWidgets();
 
+    static void collectNotReadyAssets(AssetGroup &collected, Widget &widget);
+
 protected:
     /**
      * Called by GuiWidget::update() the first time an update is being carried

diff --git a/doomsday/sdk/libappfw/src/guiwidget.cpp b/doomsday/sdk/libappfw/src/guiwidget.cpp
@@ -28,6 +28,7 @@
 #include <de/Drawable>
 #include <de/GLTexture>
 #include <de/GLTextureFramebuffer>
+#include <de/LogBuffer>
 #include <de/FocusWidget>
 #include <de/PopupWidget>
 
@@ -1260,4 +1261,25 @@ void GuiWidget::postDrawChildren()
     }
 }
 
+void GuiWidget::collectNotReadyAssets(AssetGroup &collected, Widget &widget)
+{
+    if (auto *assetGroup = widget.maybeAs<IAssetGroup>())
+    {
+        if (!assetGroup->assets().isReady())
+        {
+            collected += *assetGroup;
+
+            LOGDEV_XVERBOSE("Found " _E(m) "NotReady" _E(.) " asset %s (%p)",
+                            widget.path() << &widget);
+        }
+    }
+    else
+    {
+        foreach (Widget *child, widget.children())
+        {
+            collectNotReadyAssets(collected, *child);
+        }
+    }
+}
+
 } // namespace de
diff --git a/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp
@@ -46,7 +46,7 @@ DENG_GUI_PIMPL(PanelWidget)
     AnimationRule *openingRule;
     QTimer dismissTimer;
 
-    QScopedPointer<AssetGroup> pendingShow;
+    std::unique_ptr<AssetGroup> pendingShow;
 
     // GL objects.
     Drawable drawable;
@@ -157,29 +157,6 @@ DENG_GUI_PIMPL(PanelWidget)
         dismissTimer.setInterval((CLOSING_ANIM_SPAN + delay).asMilliSeconds());
     }
 
-    void findAssets(Widget *widget)
-    {
-        //qDebug() << "checking if" << widget << "is an asset to wait for...";
-
-        if (auto *assetGroup = widget->maybeAs<IAssetGroup>())
-        {
-            if (!assetGroup->assets().isReady())
-            {
-                *pendingShow += *assetGroup;
-
-                LOGDEV_XVERBOSE("Found " _E(m) "NotReady" _E(.) " asset %s (%p)",
-                                widget->path() << widget);
-            }
-        }
-        else
-        {
-            foreach (Widget *child, widget->children())
-            {
-                findAssets(child);
-            }
-        }
-    }
-
     void waitForAssetsInContent()
     {
         if (!waitForContentReady) return;
@@ -189,7 +166,8 @@ DENG_GUI_PIMPL(PanelWidget)
         pendingShow.reset(new AssetGroup);
 
         LOGDEV_XVERBOSE("Checking for assets that need waiting for...", "");
-        findAssets(content);
+        DENG2_ASSERT(content);
+        GuiWidget::collectNotReadyAssets(*pendingShow, *content);
 
         if (pendingShow->isEmpty())
         {