Merge branch 'load_menu' into 'master'

Enlarge character selection widget

See merge request OpenMW/openmw!2350

(cherry picked from commit a0029cb512)

8bac073f Enlarge character selection menu to fit long character or class names

apps/openmw/mwgui/savegamedialog.cpp

@@ -47,7 +47,6 @@ namespace MWGui
         getWidget(mDeleteButton, "DeleteButton");
         getWidget(mSaveList, "SaveList");
         getWidget(mSaveNameEdit, "SaveNameEdit");
-        getWidget(mSpacer, "Spacer");
         mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SaveGameDialog::onOkButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SaveGameDialog::onCancelButtonClicked);
         mDeleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SaveGameDialog::onDeleteButtonClicked);
@@ -219,7 +218,6 @@ namespace MWGui
         mSaveNameEdit->setVisible(!load);
         mCharacterSelection->setUserString("Hidden", load ? "false" : "true");
         mCharacterSelection->setVisible(load);
-        mSpacer->setUserString("Hidden", load ? "false" : "true");
 
         mDeleteButton->setUserString("Hidden", load ? "false" : "true");
         mDeleteButton->setVisible(load);

apps/openmw/mwgui/savegamedialog.hpp

@@ -63,7 +63,6 @@ namespace MWGui
         MyGUI::Button* mDeleteButton;
         MyGUI::ListBox* mSaveList;
         MyGUI::EditBox* mSaveNameEdit;
-        MyGUI::Widget* mSpacer;
 
         const MWState::Character* mCurrentCharacter;
         const MWState::Slot* mCurrentSlot;

files/data/mygui/openmw_savegame_dialog.layout

@@ -5,6 +5,11 @@
         <Property key="Padding" value="8"/>
         <Property key="Spacing" value="8"/>
 
+        <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 0 24" name="SelectCharacter">
+            <Property key="Caption" value="#{SavegameMenu:SelectCharacter}"/>
+            <UserString key="HStretch" value="true"/>
+        </Widget>
+
         <Widget type="HBox" skin="">
             <UserString key="HStretch" value="true"/>
             <UserString key="VStretch" value="true"/>
@@ -16,12 +21,6 @@
                 <UserString key="VStretch" value="true"/>
                 <Property key="Spacing" value="8"/>
 
-                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" name="SelectCharacter">
-                    <Property key="Caption" value="#{SavegameMenu:SelectCharacter}"/>
-                    <UserString key="HStretch" value="true"/>
-                </Widget>
-
-
                 <Widget type="ListBox" skin="MW_List" position="0 0 200 200" name="SaveList">
                     <UserString key="HStretch" value="true"/>
                     <UserString key="VStretch" value="true"/>
@@ -34,10 +33,6 @@
                 <UserString key="VStretch" value="true"/>
                 <Property key="Spacing" value="8"/>
 
-                <Widget type="Widget" skin="" position="0 0 200 24" name="Spacer">
-                    <Property key="Visible" value="false"/>
-                </Widget>
-
                 <Widget type="Widget" skin="MW_Box" position="0 0 263 137">
                     <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="Screenshot"/>
                 </Widget>