Widgets|libappfw: Opening a modal dialog without blocking event loop

skyjake · Nov 22, 2016 · b695bb1 · b695bb1
1 parent 7d11389
commit b695bb1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/widgets/dialogwidget.h b/doomsday/sdk/libappfw/include/de/widgets/dialogwidget.h
@@ -225,7 +225,9 @@ class LIBAPPFW_PUBLIC DialogWidget : public PopupWidget
      * Opens the dialog as non-modal. The dialog must already be added to the
      * widget tree. Use accept() or reject() to close the dialog.
      */
-    void open();
+    void open() override;
+
+    void open(Modality modality);
 
     ui::ActionItem *defaultActionItem();
 

diff --git a/doomsday/sdk/libappfw/src/widgets/dialogwidget.cpp b/doomsday/sdk/libappfw/src/widgets/dialogwidget.cpp
@@ -568,7 +568,12 @@ int DialogWidget::exec(GuiRootWidget &root)
 
 void DialogWidget::open()
 {
-    d->modality = NonModal;
+    open(NonModal);
+}
+
+void DialogWidget::open(Modality modality)
+{
+    d->modality = modality;
 
     DENG2_ASSERT(hasRoot());
     prepare(); // calls base class's open()
@@ -660,7 +665,7 @@ void DialogWidget::accept(int result)
         d->subloop.exit(result);
         emit accepted(result);
     }
-    else if (d->modality == NonModal)
+    else
     {
         emit accepted(result);
         finish(result);
@@ -675,7 +680,7 @@ void DialogWidget::reject(int result)
         d->subloop.exit(result);
         emit rejected(result);
     }
-    else if (d->modality == NonModal)
+    else
     {
         emit rejected(result);
         finish(result);