From f5868f7ae138cafda38e65d3708a0892c89f22e9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Sep 2014 13:07:38 +0200
Subject: [PATCH] Fix layout problems in generate class result dialog

---
 apps/openmw/mwgui/class.cpp                         |  7 ++++---
 .../openmw_chargen_generate_class_result.layout     | 13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 9f6306830..b661f9945 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -17,9 +17,6 @@ namespace MWGui
     GenerateClassResultDialog::GenerateClassResultDialog()
       : WindowModal("openmw_chargen_generate_class_result.layout")
     {
-        // Centre dialog
-        center();
-
         setText("ReflectT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sMessageQuestionAnswer1", ""));
 
         getWidget(mClassImage, "ClassImage");
@@ -34,6 +31,8 @@ namespace MWGui
         getWidget(okButton, "OKButton");
         okButton->setCaptionWithReplacing("#{sMessageQuestionAnswer2}");
         okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GenerateClassResultDialog::onOkClicked);
+
+        center();
     }
 
     std::string GenerateClassResultDialog::getClassId() const
@@ -46,6 +45,8 @@ namespace MWGui
         mCurrentClassId = classId;
         mClassImage->setImageTexture(std::string("textures\\levelup\\") + mCurrentClassId + ".dds");
         mClassName->setCaption(MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mCurrentClassId)->mName);
+
+        center();
     }
 
     // widget controls
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index f7178042f..edbbaeb57 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 289 256" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 289 256" name="_Main">
+        <Property key="AutoResize" value="true"/>
+        <Property key="Padding" value="12"/>
+        <Property key="Spacing" value="8"/>
+
         <!-- Class image -->
         <Widget type="Widget" skin="MW_Box" position="8 8 265 138" align="Left Top">
             <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top"/>
         </Widget>
 
         <!-- Class text -->
-        <Widget type="EditBox" skin="SandText" position="8 152 265 40" name="ReflectT" align="Left Top">
+        <Widget type="AutoSizedEditBox" skin="SandText" position="8 152 265 40" name="ReflectT" align="Left Top">
             <Property key="TextAlign" value="Top HCenter"/>
             <Property key="MultiLine" value="true"/>
             <Property key="WordWrap" value="true"/>
             <Property key="Static" value="true"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="8 183 265 23" name="ClassName" align="Left Top">
+        <Widget type="AutoSizedTextBox" skin="SandText" position="8 183 265 23" name="ClassName" align="Left Top">
             <Property key="Caption" value="[Class]"/>
             <Property key="TextAlign" value="Top HCenter"/>
         </Widget>
 
         <!-- Dialog buttons -->
         <Widget type="HBox" position="0 216 273 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>