mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 07:06:45 +00:00
Code Issues Releases Wiki Activity

Spell window: dynamically resize the edit box, change delete button caption

Browse source
This commit is contained in:
Ilya Zhuravlev 2019-04-25 08:46:11 -04:00
parent 2d94fa20d2
commit 26ac7412a0
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwgui/spellwindow.cpp
View file

@ -3,6 +3,7 @@
#include <MyGUI_Button.h> #include <MyGUI_Button.h>
#include <MyGUI_EditBox.h> #include <MyGUI_EditBox.h>
#include <MyGUI_InputManager.h> #include <MyGUI_InputManager.h>
#include <MyGUI_Window.h>
#include <components/misc/stringops.hpp> #include <components/misc/stringops.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
@ -33,22 +34,25 @@ namespace MWGui
: WindowPinnableBase("openmw_spell_window.layout") : WindowPinnableBase("openmw_spell_window.layout")
, NoDrop(drag, mMainWidget) , NoDrop(drag, mMainWidget)
, mSpellView(nullptr) , mSpellView(nullptr)
, mDeleteButton(nullptr)
, mUpdateTimer(0.0f) , mUpdateTimer(0.0f)
{ {
mSpellIcons = new SpellIcons(); mSpellIcons = new SpellIcons();
MyGUI::Button *deleteSpellBtn = nullptr;
getWidget(mSpellView, "SpellView"); getWidget(mSpellView, "SpellView");
getWidget(mEffectBox, "EffectsBox"); getWidget(mEffectBox, "EffectsBox");
getWidget(mFilterEdit, "FilterEdit"); getWidget(mFilterEdit, "FilterEdit");
getWidget(deleteSpellBtn, "DeleteSpellButton"); getWidget(mDeleteButton, "DeleteSpellButton");
mFilterEdit->setUserString("IgnoreTabKey", "y"); mFilterEdit->setUserString("IgnoreTabKey", "y");
mSpellView->eventSpellClicked += MyGUI::newDelegate(this, &SpellWindow::onModelIndexSelected); mSpellView->eventSpellClicked += MyGUI::newDelegate(this, &SpellWindow::onModelIndexSelected);
mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &SpellWindow::onFilterChanged); mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &SpellWindow::onFilterChanged);
deleteSpellBtn->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onDeleteClicked); mDeleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onDeleteClicked);
MyGUI::Window* t = mMainWidget->castType<MyGUI::Window>();
t->eventWindowChangeCoord += MyGUI::newDelegate(this, &SpellWindow::onWindowResize);
onWindowResize(t);
setCoord(498, 300, 302, 300); setCoord(498, 300, 302, 300);
} }
@ -254,4 +258,10 @@ namespace MWGui
else else
onSpellSelected(spell.mId); onSpellSelected(spell.mId);
} }
void SpellWindow::onWindowResize(MyGUI::Window* window) {
MyGUI::IntSize sz = mFilterEdit->getSize();
sz.width = window->getSize().width - mDeleteButton->getSize().width - 40;
mFilterEdit->setSize(sz);
}
} }

2
apps/openmw/mwgui/spellwindow.hpp
View file

@ -36,6 +36,7 @@ namespace MWGui
void onDeleteClicked(MyGUI::Widget *widget); void onDeleteClicked(MyGUI::Widget *widget);
void onDeleteSpellAccept(); void onDeleteSpellAccept();
void askDeleteSpell(const std::string& spellId); void askDeleteSpell(const std::string& spellId);
void onWindowResize(MyGUI::Window* window);
virtual void onPinToggled(); virtual void onPinToggled();
virtual void onTitleDoubleClicked(); virtual void onTitleDoubleClicked();
@ -44,6 +45,7 @@ namespace MWGui
SpellView* mSpellView; SpellView* mSpellView;
SpellIcons* mSpellIcons; SpellIcons* mSpellIcons;
MyGUI::EditBox* mFilterEdit; MyGUI::EditBox* mFilterEdit;
MyGUI::Button* mDeleteButton;
private: private:
float mUpdateTimer; float mUpdateTimer;

5
files/mygui/openmw_spell_window.layout
View file

@ -15,8 +15,9 @@
<Widget type="Widget" position="8 535 268 23" align="Left Bottom HStretch"> <Widget type="Widget" position="8 535 268 23" align="Left Bottom HStretch">
<!-- Spell deletion button --> <!-- Spell deletion button -->
<Widget type="Button" skin="MW_Button" align="Right Bottom" position="108 0 160 24" name="DeleteSpellButton"> <Widget type="AutoSizedButton" skin="MW_Button" align="Right Bottom" position="268 0 0 24" name="DeleteSpellButton">
<Property key="Caption" value="#{sDeleteSpell}"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sDelete}"/>
<Property key="NeedKey" value="false"/> <Property key="NeedKey" value="false"/>
</Widget> </Widget>