Widgets|libappfw: Closing a parent popup when child popup closes

skyjake · Nov 12, 2017 · 114ccaf · 114ccaf
1 parent 69a6a16
commit 114ccaf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/framework/item.h b/doomsday/sdk/libappfw/include/de/framework/item.h
@@ -59,6 +59,7 @@ class LIBAPPFW_PUBLIC Item
         ActivationClosesPopup = 0x100,
         Separator             = 0x200,
         Annotation            = 0x400 | Separator,
+        ClosesParentPopup     = 0x800,
 
         DefaultSemantics      = ShownAsLabel
     };

diff --git a/doomsday/sdk/libappfw/include/de/framework/subwidgetitem.h b/doomsday/sdk/libappfw/include/de/framework/subwidgetitem.h
@@ -48,6 +48,12 @@ class LIBAPPFW_PUBLIC SubwidgetItem : public ImageItem
         , _constructor(constructor)
         , _dir(openingDirection) {}
 
+    SubwidgetItem(Semantics semantics, String const &label, ui::Direction openingDirection,
+                  WidgetConstructor constructor)
+        : ImageItem(semantics, label)
+        , _constructor(constructor)
+        , _dir(openingDirection) {}
+
     SubwidgetItem(Image const &image, String const &label, ui::Direction openingDirection,
                   WidgetConstructor constructor)
         : ImageItem(ShownAsButton, image, label)

diff --git a/doomsday/sdk/libappfw/include/de/widgets/popupmenuwidget.h b/doomsday/sdk/libappfw/include/de/widgets/popupmenuwidget.h
@@ -35,6 +35,7 @@ class LIBAPPFW_PUBLIC PopupMenuWidget : public PopupWidget
     PopupMenuWidget(String const &name = String());
 
     void setParentPopup(PopupWidget *parentPopup);
+    PopupWidget *parentPopup() const;
 
     MenuWidget &menu() const;
 

diff --git a/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp
@@ -159,6 +159,14 @@ DENG2_PIMPL(MenuWidget)
             setWidget(_item.makeWidget(), _item.openingDirection());
             _widget->setDeleteAfterDismissed(true);
 
+            if (_item.semantics().testFlag(Item::ClosesParentPopup))
+            {
+                // PopupMenuWidget has a MenuWidget as content.
+                if (auto *selfPopup = maybeAs<PopupMenuWidget>(d->self().parentGuiWidget()))
+                {
+                    QObject::connect(_widget.get(), SIGNAL(closed()), selfPopup, SLOT(close()));
+                }
+            }
             SubAction::trigger();
         }
 

diff --git a/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp
@@ -431,6 +431,11 @@ void PopupMenuWidget::setParentPopup(PopupWidget *parentPopup)
     d->parentPopup.reset(parentPopup);
 }
 
+PopupWidget *PopupMenuWidget::parentPopup() const
+{
+    return d->parentPopup;
+}
+
 MenuWidget &PopupMenuWidget::menu() const
 {
     return static_cast<MenuWidget &>(content());