Widgets|libappfw: Improved MessageDialog layout with custom widgets

skyjake · Jul 15, 2016 · ee62a92 · ee62a92
1 parent 8a67e2b
commit ee62a92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/dialogs/messagedialog.h b/doomsday/sdk/libappfw/include/de/dialogs/messagedialog.h
@@ -38,11 +38,13 @@ class LIBAPPFW_PUBLIC MessageDialog : public DialogWidget
     LabelWidget &title();
     LabelWidget &message();
 
+    enum LayoutBehavior { ExcludeHidden, IncludeHidden };
+
     /**
      * Derived classes should call this after they add or remove widgets in the
      * dialog content area.
      */
-    void updateLayout();
+    void updateLayout(LayoutBehavior behavior = ExcludeHidden);
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/sdk/libappfw/src/dialogs/messagedialog.cpp b/doomsday/sdk/libappfw/src/dialogs/messagedialog.cpp
@@ -55,7 +55,7 @@ DENG_GUI_PIMPL(MessageDialog)
         updateLayout();
     }
 
-    void updateLayout()
+    void updateLayout(LayoutBehavior behavior = ExcludeHidden)
     {
         ScrollAreaWidget &area = self.area();
 
@@ -68,7 +68,7 @@ DENG_GUI_PIMPL(MessageDialog)
         foreach (Widget *w, area.childWidgets())
         {
             // Individual children can be hidden to exclude them from the layout.
-            if (!w->behavior().testFlag(Widget::Hidden))
+            if (behavior == IncludeHidden || !w->behavior().testFlag(Widget::Hidden))
             {
                 layout << w->as<GuiWidget>();
             }
@@ -106,9 +106,9 @@ LabelWidget &MessageDialog::message()
     return *d->message;
 }
 
-void MessageDialog::updateLayout()
+void MessageDialog::updateLayout(LayoutBehavior behavior)
 {
-    d->updateLayout();
+    d->updateLayout(behavior);
 }
 
 } // namespace de