From 843106fc616488ca174cd9d30d504254546fe631 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 24 Sep 2017 12:58:14 +0200
Subject: [PATCH] Handle the wait progress bar as part of the GUI mode

---
 apps/openmw/mwgui/trainingwindow.cpp   | 19 +++++++++++++------
 apps/openmw/mwgui/trainingwindow.hpp   |  4 ++++
 apps/openmw/mwgui/waitdialog.cpp       | 20 ++++++++++++--------
 apps/openmw/mwgui/waitdialog.hpp       |  3 ++-
 apps/openmw/mwgui/windowmanagerimp.cpp |  4 ++--
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index c1f7f8ac1..13a0a6883 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -51,12 +51,18 @@ namespace MWGui
 
         mTimeAdvancer.eventProgressChanged += MyGUI::newDelegate(this, &TrainingWindow::onTrainingProgressChanged);
         mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &TrainingWindow::onTrainingFinished);
-
-        mProgressBar.setVisible(false);
     }
 
     void TrainingWindow::onOpen()
     {
+        if (mTimeAdvancer.isRunning())
+        {
+            mProgressBar.setVisible(true);
+            setVisible(false);
+        }
+        else
+            mProgressBar.setVisible(false);
+
         center();
     }
 
@@ -166,15 +172,12 @@ namespace MWGui
         // add gold to NPC trading gold pool
         npcStats.setGoldPool(npcStats.getGoldPool() + price);
 
-        // go back to game mode
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Training);
-        MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
-
         // advance time
         MWBase::Environment::get().getMechanicsManager()->rest(false);
         MWBase::Environment::get().getMechanicsManager()->rest(false);
         MWBase::Environment::get().getWorld ()->advanceTime (2);
 
+        setVisible(false);
         mProgressBar.setVisible(true);
         mProgressBar.setProgress(0, 2);
         mTimeAdvancer.run(2);
@@ -191,6 +194,10 @@ namespace MWGui
     void TrainingWindow::onTrainingFinished()
     {
         mProgressBar.setVisible(false);
+
+        // go back to game mode
+        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Training);
+        MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
     }
 
     void TrainingWindow::onFrame(float dt)
diff --git a/apps/openmw/mwgui/trainingwindow.hpp b/apps/openmw/mwgui/trainingwindow.hpp
index 127c85f6a..fb7b10deb 100644
--- a/apps/openmw/mwgui/trainingwindow.hpp
+++ b/apps/openmw/mwgui/trainingwindow.hpp
@@ -16,10 +16,14 @@ namespace MWGui
 
         virtual void onOpen();
 
+        bool exit() { return false; }
+
         void setPtr(const MWWorld::Ptr& actor);
 
         void onFrame(float dt);
 
+        WindowBase* getProgressBar() { return &mProgressBar; }
+
         void clear() { resetReference(); }
 
     protected:
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index cd1d29854..8a360435c 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -75,8 +75,6 @@ namespace MWGui
         mTimeAdvancer.eventProgressChanged += MyGUI::newDelegate(this, &WaitDialog::onWaitingProgressChanged);
         mTimeAdvancer.eventInterrupted += MyGUI::newDelegate(this, &WaitDialog::onWaitingInterrupted);
         mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished);
-
-        mProgressBar.setVisible (false);
     }
 
     void WaitDialog::setPtr(const MWWorld::Ptr &ptr)
@@ -86,11 +84,22 @@ namespace MWGui
 
     bool WaitDialog::exit()
     {
-        return (!mProgressBar.isVisible()); //Only exit if not currently waiting
+        return (!mTimeAdvancer.isRunning()); //Only exit if not currently waiting
     }
 
     void WaitDialog::onOpen()
     {
+        if (mTimeAdvancer.isRunning())
+        {
+            mProgressBar.setVisible(true);
+            setVisible(false);
+            return;
+        }
+        else
+        {
+            mProgressBar.setVisible(false);
+        }
+
         if (!MWBase::Environment::get().getWindowManager ()->getRestEnabled ())
         {
             MWBase::Environment::get().getWindowManager()->popGuiMode ();
@@ -262,11 +271,6 @@ namespace MWGui
         }
     }
 
-    void WaitDialog::clear()
-    {
-        mProgressBar.setVisible(false);
-    }
-
     void WaitDialog::stopWaiting ()
     {
         MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.2f);
diff --git a/apps/openmw/mwgui/waitdialog.hpp b/apps/openmw/mwgui/waitdialog.hpp
index 6bd90473f..c7ccee025 100644
--- a/apps/openmw/mwgui/waitdialog.hpp
+++ b/apps/openmw/mwgui/waitdialog.hpp
@@ -34,12 +34,13 @@ namespace MWGui
         virtual bool exit();
 
         void onFrame(float dt);
-        void clear();
 
         bool getSleeping() { return mTimeAdvancer.isRunning() && mSleeping; }
         void wakeUp();
         void autosave();
 
+        WindowBase* getProgressBar() { return &mProgressBar; }
+
     protected:
         MyGUI::TextBox* mDateTimeText;
         MyGUI::TextBox* mRestText;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6c69dffbc..c572bce54 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -414,7 +414,7 @@ namespace MWGui
 
         mWaitDialog = new WaitDialog();
         mWindows.push_back(mWaitDialog);
-        mGuiModeStates[GM_Rest] = GuiModeState(mWaitDialog);
+        mGuiModeStates[GM_Rest] = GuiModeState({mWaitDialog->getProgressBar(), mWaitDialog});
 
         SpellCreationDialog* spellCreationDialog = new SpellCreationDialog();
         mWindows.push_back(spellCreationDialog);
@@ -426,7 +426,7 @@ namespace MWGui
 
         TrainingWindow* trainingWindow = new TrainingWindow();
         mWindows.push_back(trainingWindow);
-        mGuiModeStates[GM_Training] = GuiModeState(trainingWindow);
+        mGuiModeStates[GM_Training] = GuiModeState({trainingWindow->getProgressBar(), trainingWindow});
 
         MerchantRepair* merchantRepair = new MerchantRepair();
         mWindows.push_back(merchantRepair);