From 8bac073f9c61e0910ebab6da052197a34951b856 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 28 Aug 2022 21:35:11 +0400
Subject: [PATCH] Enlarge character selection menu to fit long character or
class names
---
apps/openmw/mwgui/savegamedialog.cpp | 2 --
apps/openmw/mwgui/savegamedialog.hpp | 1 -
files/data/mygui/openmw_savegame_dialog.layout | 15 +++++----------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 71127c26e1..15ead5d887 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/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);
diff --git a/apps/openmw/mwgui/savegamedialog.hpp b/apps/openmw/mwgui/savegamedialog.hpp
index c22d86fd11..86d4ade8ac 100644
--- a/apps/openmw/mwgui/savegamedialog.hpp
+++ b/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;
diff --git a/files/data/mygui/openmw_savegame_dialog.layout b/files/data/mygui/openmw_savegame_dialog.layout
index 8a0a461eb1..d2d8df295f 100644
--- a/files/data/mygui/openmw_savegame_dialog.layout
+++ b/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>