teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Allow double click / Enter key for accepting race/class/birthsign

Browse source
This commit is contained in:
scrawl 2014-01-28 20:12:37 +01:00
parent a8a09762ce
commit edff88542b
6 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/birth.cpp
View file

@ -33,8 +33,7 @@ namespace MWGui
getWidget(mBirthList, "BirthsignList"); getWidget(mBirthList, "BirthsignList");
mBirthList->setScrollVisible(true); mBirthList->setScrollVisible(true);
mBirthList->eventListSelectAccept += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth); mBirthList->eventListSelectAccept += MyGUI::newDelegate(this, &BirthDialog::onAccept);
mBirthList->eventListMouseItemActivate += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
mBirthList->eventListChangePosition += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth); mBirthList->eventListChangePosition += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
MyGUI::Button* backButton; MyGUI::Button* backButton;
@ -97,6 +96,14 @@ namespace MWGui
eventDone(this); eventDone(this);
} }
void BirthDialog::onAccept(MyGUI::ListBox *_sender, size_t _index)
{
onSelectBirth(_sender, _index);
if(mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
return;
eventDone(this);
}
void BirthDialog::onBackClicked(MyGUI::Widget* _sender) void BirthDialog::onBackClicked(MyGUI::Widget* _sender)
{ {
eventBack(); eventBack();

1
apps/openmw/mwgui/birth.hpp
View file

@ -38,6 +38,7 @@ namespace MWGui
protected: protected:
void onSelectBirth(MyGUI::ListBox* _sender, size_t _index); void onSelectBirth(MyGUI::ListBox* _sender, size_t _index);
void onAccept(MyGUI::ListBox* _sender, size_t index);
void onOkClicked(MyGUI::Widget* _sender); void onOkClicked(MyGUI::Widget* _sender);
void onBackClicked(MyGUI::Widget* _sender); void onBackClicked(MyGUI::Widget* _sender);

11
apps/openmw/mwgui/class.cpp
View file

@ -82,8 +82,7 @@ namespace MWGui
getWidget(mClassList, "ClassList"); getWidget(mClassList, "ClassList");
mClassList->setScrollVisible(true); mClassList->setScrollVisible(true);
mClassList->eventListSelectAccept += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass); mClassList->eventListSelectAccept += MyGUI::newDelegate(this, &PickClassDialog::onAccept);
mClassList->eventListMouseItemActivate += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
mClassList->eventListChangePosition += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass); mClassList->eventListChangePosition += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
getWidget(mClassImage, "ClassImage"); getWidget(mClassImage, "ClassImage");
@ -152,6 +151,14 @@ namespace MWGui
eventBack(); eventBack();
} }
void PickClassDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
{
onSelectClass(_sender, _index);
if(mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
return;
eventDone(this);
}
void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index) void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
{ {
if (_index == MyGUI::ITEM_NONE) if (_index == MyGUI::ITEM_NONE)

1
apps/openmw/mwgui/class.hpp
View file

@ -111,6 +111,7 @@ namespace MWGui
protected: protected:
void onSelectClass(MyGUI::ListBox* _sender, size_t _index); void onSelectClass(MyGUI::ListBox* _sender, size_t _index);
void onAccept(MyGUI::ListBox* _sender, size_t _index);
void onOkClicked(MyGUI::Widget* _sender); void onOkClicked(MyGUI::Widget* _sender);
void onBackClicked(MyGUI::Widget* _sender); void onBackClicked(MyGUI::Widget* _sender);

11
apps/openmw/mwgui/race.cpp
View file

@ -70,8 +70,7 @@ namespace MWGui
setText("RaceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu5", "Race")); setText("RaceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu5", "Race"));
getWidget(mRaceList, "RaceList"); getWidget(mRaceList, "RaceList");
mRaceList->setScrollVisible(true); mRaceList->setScrollVisible(true);
mRaceList->eventListSelectAccept += MyGUI::newDelegate(this, &RaceDialog::onSelectRace); mRaceList->eventListSelectAccept += MyGUI::newDelegate(this, &RaceDialog::onAccept);
mRaceList->eventListMouseItemActivate += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
mRaceList->eventListChangePosition += MyGUI::newDelegate(this, &RaceDialog::onSelectRace); mRaceList->eventListChangePosition += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
setText("SkillsT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sBonusSkillTitle", "Skill Bonus")); setText("SkillsT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sBonusSkillTitle", "Skill Bonus"));
@ -241,6 +240,14 @@ namespace MWGui
updateSpellPowers(); updateSpellPowers();
} }
void RaceDialog::onAccept(MyGUI::ListBox *_sender, size_t _index)
{
onSelectRace(_sender, _index);
if(mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
return;
eventDone(this);
}
void RaceDialog::getBodyParts (int part, std::vector<std::string>& out) void RaceDialog::getBodyParts (int part, std::vector<std::string>& out)
{ {
out.clear(); out.clear();

1
apps/openmw/mwgui/race.hpp
View file

@ -67,6 +67,7 @@ namespace MWGui
void onSelectNextHair(MyGUI::Widget* _sender); void onSelectNextHair(MyGUI::Widget* _sender);
void onSelectRace(MyGUI::ListBox* _sender, size_t _index); void onSelectRace(MyGUI::ListBox* _sender, size_t _index);
void onAccept(MyGUI::ListBox* _sender, size_t _index);
void onOkClicked(MyGUI::Widget* _sender); void onOkClicked(MyGUI::Widget* _sender);
void onBackClicked(MyGUI::Widget* _sender); void onBackClicked(MyGUI::Widget* _sender);