From 08f34e53560417354c3452f8fb7bcd9f530dda70 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 8 Oct 2017 02:42:41 +0300
Subject: [PATCH] [Client] Fix recent problems with password window

---
 apps/openmw/mwmp/GUI/TextInputDialog.cpp |  5 +++++
 apps/openmw/mwmp/GUI/TextInputDialog.hpp |  1 +
 apps/openmw/mwmp/GUIController.cpp       |  3 ++-
 files/mygui/tes3mp_text_input.layout     | 18 ++++++++++++++----
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmp/GUI/TextInputDialog.cpp b/apps/openmw/mwmp/GUI/TextInputDialog.cpp
index 38793a6eb..eaa687f09 100644
--- a/apps/openmw/mwmp/GUI/TextInputDialog.cpp
+++ b/apps/openmw/mwmp/GUI/TextInputDialog.cpp
@@ -62,6 +62,11 @@ namespace mwmp
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
     }
 
+    bool TextInputDialog::exit()
+    {
+        return false;
+    }
+
 // widget controls
 
     void TextInputDialog::onOkClicked(MyGUI::Widget *_sender)
diff --git a/apps/openmw/mwmp/GUI/TextInputDialog.hpp b/apps/openmw/mwmp/GUI/TextInputDialog.hpp
index cf6b3a1ff..a79759ffd 100644
--- a/apps/openmw/mwmp/GUI/TextInputDialog.hpp
+++ b/apps/openmw/mwmp/GUI/TextInputDialog.hpp
@@ -30,6 +30,7 @@ namespace mwmp
         void setEditPassword(bool value);
 
         virtual void onOpen();
+        virtual bool exit();
 
         /** Event : Dialog finished, OK button clicked.\n
             signature : void method()\n
diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp
index 9f4678819..9cd496887 100644
--- a/apps/openmw/mwmp/GUIController.cpp
+++ b/apps/openmw/mwmp/GUIController.cpp
@@ -158,12 +158,13 @@ void mwmp::GUIController::showInputBox(const BasePlayer::GUIMessageBox &guiMessa
 
     mInputBox->eventDone += MyGUI::newDelegate(this, &GUIController::onInputBoxDone);
 
+    mInputBox->setVisible(true);
 }
 
 void mwmp::GUIController::onInputBoxDone(MWGui::WindowBase *parWindow)
 {
     //MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
-    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "GUIController::OnInputBoxDone: %s.",mInputBox->getTextInput().c_str());
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "GUIController::onInputBoxDone: %s.",mInputBox->getTextInput().c_str());
 
     Main::get().getLocalPlayer()->guiMessageBox.data = mInputBox->getTextInput();
     Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->setPlayer(Main::get().getLocalPlayer());
diff --git a/files/mygui/tes3mp_text_input.layout b/files/mygui/tes3mp_text_input.layout
index fd73ab168..7898d3d96 100644
--- a/files/mygui/tes3mp_text_input.layout
+++ b/files/mygui/tes3mp_text_input.layout
@@ -24,10 +24,20 @@
             </Widget>
         </Widget>
 
-        <Widget type="AutoSizedEditBox" skin="HeaderText" position="6 96 300 0" name="TextNote" align="Left Top">
-            <Property key="TextAlign" value="Center"/>
-            <Property key="MultiLine" value="true"/>
-            <Property key="WordWrap" value="true"/>
+        <Widget type="VBox" skin="">
+            <Property key="AutoResize" value="true"/>
+            <Property key="Padding" value="10"/>
+            <Property key="Spacing" value="12"/>
+
+            <Widget type="Widget">
+                <UserString key="VStretch" value="true"/>
+            </Widget>
+
+            <Widget type="AutoSizedEditBox" skin="HeaderText" position="6 96 300 0" name="TextNote" align="Left Top">
+                <Property key="TextAlign" value="Center"/>
+                <Property key="MultiLine" value="true"/>
+                <Property key="WordWrap" value="true"/>
+            </Widget>
         </Widget>
 
     </Widget>