Refactor|libappfw: Use IAssetGroup for labels and menus

skyjake · Apr 19, 2016 · d766f5d · d766f5d
1 parent ab187a8
commit d766f5d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/widgets/labelwidget.h b/doomsday/sdk/libappfw/include/de/widgets/labelwidget.h
@@ -68,11 +68,13 @@ class Image;
  *
  * @ingroup guiWidgets
  */
-class LIBAPPFW_PUBLIC LabelWidget : public GuiWidget, public AssetGroup
+class LIBAPPFW_PUBLIC LabelWidget : public GuiWidget, public IAssetGroup
 {
 public:
     LabelWidget(String const &name = "");
 
+    AssetGroup &assets() override;
+
     void setText(String const &text);
     void setImage(Image const &image);
 

diff --git a/doomsday/sdk/libappfw/include/de/widgets/menuwidget.h b/doomsday/sdk/libappfw/include/de/widgets/menuwidget.h
@@ -29,6 +29,8 @@
 #include "../ButtonWidget"
 #include "../PanelWidget"
 
+#include <de/Asset>
+
 namespace de {
 
 /**
@@ -48,13 +50,15 @@ namespace de {
  *
  * @ingroup guiWidgets
  */
-class LIBAPPFW_PUBLIC MenuWidget : public ScrollAreaWidget
+class LIBAPPFW_PUBLIC MenuWidget : public ScrollAreaWidget, public IAssetGroup
 {
     Q_OBJECT
 
 public:
     MenuWidget(String const &name = "");
 
+    AssetGroup &assets() override;
+
     /**
      * Configures the layout grid.
      *

diff --git a/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
@@ -33,6 +33,7 @@ public Font::RichFormat::IStyle
 {
     typedef DefaultVertexBuf VertexBuf;
 
+    AssetGroup assets;
     SizePolicy horizPolicy;
     SizePolicy vertPolicy;
     AlignmentMode alignMode;
@@ -108,7 +109,7 @@ public Font::RichFormat::IStyle
         updateStyle();
 
         // The readiness of the LabelWidget depends on glText being ready.
-        self += glText;
+        assets += glText;
     }
 
     ~Instance()
@@ -578,6 +579,11 @@ public Font::RichFormat::IStyle
 LabelWidget::LabelWidget(String const &name) : GuiWidget(name), d(new Instance(this))
 {}
 
+AssetGroup &LabelWidget::assets()
+{
+    return d->assets;
+}
+
 void LabelWidget::setText(String const &text)
 {
     if(text != d->glText.text())
@@ -756,11 +762,11 @@ void LabelWidget::update()
     bool visibleNow = isVisible();
     if(d->wasVisible && !visibleNow)
     {
-        setPolicy(d->glText, Ignore);
+        d->assets.setPolicy(d->glText, AssetGroup::Ignore);
     }
     else if(!d->wasVisible && visibleNow)
     {
-        setPolicy(d->glText, Required);
+        d->assets.setPolicy(d->glText, AssetGroup::Required);
     }
     d->wasVisible = visibleNow;
 

diff --git a/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp
@@ -147,6 +147,7 @@ DENG2_PIMPL(MenuWidget)
         ui::SubwidgetItem const &_item;
     };
 
+    AssetGroup assets;
     bool needLayout = false;
     GridLayout layout;
     ListData defaultItems;
@@ -219,18 +220,28 @@ DENG2_PIMPL(MenuWidget)
         needLayout = true;
     }
 
-    void widgetChildAdded(Widget &)
+    void widgetChildAdded(Widget &child)
     {
         // Make sure we redo the layout with the new child. This occurs
         // when filtered items are accepted again as widgets.
         needLayout = true;
+
+        if(IAssetGroup *asset = child.maybeAs<IAssetGroup>())
+        {
+            assets += *asset; // part of the asset group
+        }
     }
 
-    void widgetChildRemoved(Widget &)
+    void widgetChildRemoved(Widget &child)
     {
         // Make sure we redo the layout without this child. This occurs
         // when filtered items are removed from the menu.
         needLayout = true;
+
+        if(IAssetGroup *asset = child.maybeAs<IAssetGroup>())
+        {
+            assets -= *asset; // no longer part of the asset group
+        }
     }
 
     static void setFoldIndicatorForDirection(LabelWidget &label, ui::Direction dir)
@@ -414,6 +425,11 @@ MenuWidget::MenuWidget(String const &name)
     setBehavior(ChildVisibilityClipping, UnsetFlags);
 }
 
+AssetGroup &MenuWidget::assets()
+{
+    return d->assets;
+}
+
 void MenuWidget::setGridSize(int columns, ui::SizePolicy columnPolicy,
                              int rows, ui::SizePolicy rowPolicy,
                              GridLayout::Mode layoutMode)