Refactor|libappfw|Client: Use Untrapper in dialogs and tutorial

skyjake · Mar 10, 2014 · 8173ce9 · 8173ce9
1 parent 9c8f3c4
commit 8173ce9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/doomsday/client/src/ui/widgets/tutorialwidget.cpp b/doomsday/client/src/ui/widgets/tutorialwidget.cpp
@@ -25,6 +25,7 @@
 
 #include <de/MessageDialog>
 #include <de/SignalAction>
+#include <de/Untrapper>
 
 using namespace de;
 
@@ -44,11 +45,15 @@ DENG_GUI_PIMPL(TutorialWidget)
     MessageDialog *dlg;
     LabelWidget *highlight;
     QTimer flashing;
+    bool taskBarInitiallyOpen;
+    Untrapper untrapper;
 
     Instance(Public *i)
         : Base(i)
         , current(Welcome)
         , dlg(0)
+        , taskBarInitiallyOpen(ClientWindow::main().taskBar().isOpen())
+        , untrapper(ClientWindow::main())
     {
         self.add(darken = new LabelWidget);
         darken->set(Background(style().colors().colorf("altaccent") *
@@ -234,6 +239,11 @@ void TutorialWidget::start()
 
 void TutorialWidget::stop()
 {
+    if(!d->taskBarInitiallyOpen)
+    {
+        ClientWindow::main().taskBar().close();
+    }
+
     d->deinitStep();
 
     // Animate away and unfade darkening.

diff --git a/doomsday/libappfw/src/widgets/dialogwidget.cpp b/doomsday/libappfw/src/widgets/dialogwidget.cpp
@@ -25,6 +25,7 @@
 
 #include <de/KeyEvent>
 #include <de/MouseEvent>
+#include <de/Untrapper>
 #include <QEventLoop>
 
 namespace de {
@@ -95,7 +96,7 @@ public ChildWidgetOrganizer::IFilter
     bool needButtonUpdate;
     float normalGlow;
     bool animatingGlow;
-    bool needTrapAfterClose;
+    QScopedPointer<Untrapper> untrapper;
     DialogContentStylist stylist;
 
     Instance(Public *i, Flags const &dialogFlags)
@@ -106,7 +107,6 @@ public ChildWidgetOrganizer::IFilter
         , acceptAction(0)
         , needButtonUpdate(false)
         , animatingGlow(false)
-        , needTrapAfterClose(false)
     {
         // Initialize the border glow.
         normalGlow = style().colors().colorf("glow").w;
@@ -615,12 +615,8 @@ void DialogWidget::reject(int result)
 
 void DialogWidget::prepare()
 {
-    if(root().window().canvas().isMouseTrapped())
-    {
-        // Mouse needs to be untrapped for the user to be access the dialog.
-        root().window().canvas().trapMouse(false);
-        d->needTrapAfterClose = true;
-    }
+    // Mouse needs to be untrapped for the user to be access the dialog.
+    d->untrapper.reset(new Untrapper(root().window()));
 
     root().setFocus(0);
 
@@ -651,11 +647,7 @@ void DialogWidget::finish(int result)
     root().setFocus(0);
     close();
 
-    if(d->needTrapAfterClose)
-    {
-        root().window().canvas().trapMouse();
-        d->needTrapAfterClose = false;
-    }
+    d->untrapper.reset();
 
     if(result > 0)
     {