mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'load_menu' into 'master'

Browse Source 
Enlarge character selection widget

See merge request OpenMW/openmw!2350
This commit is contained in:
psi29a 2022-08-30 07:43:05 +00:00
commit a0029cb512
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/savegamedialog.cpp
View File

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

1
apps/openmw/mwgui/savegamedialog.hpp
View File

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

15
files/data/mygui/openmw_savegame_dialog.layout
View File

@ -5,6 +5,11 @@
<Property key="Padding" value="8"/> <Property key="Padding" value="8"/>
<Property key="Spacing" 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=""> <Widget type="HBox" skin="">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
@ -16,12 +21,6 @@
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<Property key="Spacing" value="8"/> <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"> <Widget type="ListBox" skin="MW_List" position="0 0 200 200" name="SaveList">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
@ -34,10 +33,6 @@
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<Property key="Spacing" value="8"/> <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="Widget" skin="MW_Box" position="0 0 263 137">
<Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="Screenshot"/> <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="Screenshot"/>
</Widget> </Widget>