mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 02:26:38 +00:00
Code Issues Releases Wiki Activity

Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.

Browse source
This commit is contained in:
scrawl 2013-11-21 19:07:54 +01:00
parent 2702d10911
commit cf79a83d4f
1 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/openmw/mwgui/mainmenu.cpp
View file

@ -40,22 +40,23 @@ namespace MWGui
void MainMenu::onButtonClicked(MyGUI::Widget *sender) void MainMenu::onButtonClicked(MyGUI::Widget *sender)
{ {
std::string name = *sender->getUserData<std::string>();
MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f); MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f);
if (sender == mButtons["return"]) if (name == "return")
{ {
MWBase::Environment::get().getSoundManager ()->resumeSounds (MWBase::SoundManager::Play_TypeSfx); MWBase::Environment::get().getSoundManager ()->resumeSounds (MWBase::SoundManager::Play_TypeSfx);
MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu); MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu);
} }
else if (sender == mButtons["options"]) else if (name == "options")
MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings); MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings);
else if (sender == mButtons["exitgame"]) else if (name == "exitgame")
MWBase::Environment::get().getStateManager()->requestQuit(); MWBase::Environment::get().getStateManager()->requestQuit();
else if (sender == mButtons["newgame"]) else if (name == "newgame")
{ {
MWBase::Environment::get().getStateManager()->newGame(); MWBase::Environment::get().getStateManager()->newGame();
} }
else if (sender == mButtons["loadgame"]) else if (name == "loadgame")
{ {
// for testing purpose, pick the first slot of the first character: // for testing purpose, pick the first slot of the first character:
const MWState::Character& character = const MWState::Character& character =
@ -68,7 +69,7 @@ namespace MWGui
// dialog->setLoadOrSave(true); // dialog->setLoadOrSave(true);
// dialog->setVisible(true); // dialog->setVisible(true);
} }
else if (sender == mButtons["savegame"]) else if (name == "savegame")
{ {
// for testing purpose, save into a new slot: // for testing purpose, save into a new slot:
MWBase::Environment::get().getStateManager()->saveGame (0); MWBase::Environment::get().getStateManager()->saveGame (0);
@ -84,10 +85,9 @@ namespace MWGui
setCoord(0,0, mWidth, mHeight); setCoord(0,0, mWidth, mHeight);
if (mButtonBox) if (!mButtonBox)
MyGUI::Gui::getInstance ().destroyWidget(mButtonBox);
mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default); mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
int curH = 0; int curH = 0;
MWBase::StateManager::State state = MWBase::Environment::get().getStateManager()->getState(); MWBase::StateManager::State state = MWBase::Environment::get().getStateManager()->getState();
@ -110,28 +110,41 @@ namespace MWGui
//buttons.push_back("credits"); //buttons.push_back("credits");
buttons.push_back("exitgame"); buttons.push_back("exitgame");
int maxwidth = 0; // Create new buttons if needed
mButtons.clear();
for (std::vector<std::string>::iterator it = buttons.begin(); it != buttons.end(); ++it) for (std::vector<std::string>::iterator it = buttons.begin(); it != buttons.end(); ++it)
{
if (mButtons.find(*it) == mButtons.end())
{ {
MWGui::ImageButton* button = mButtonBox->createWidget<MWGui::ImageButton> MWGui::ImageButton* button = mButtonBox->createWidget<MWGui::ImageButton>
("ImageBox", MyGUI::IntCoord(0, curH, 0, 0), MyGUI::Align::Default); ("ImageBox", MyGUI::IntCoord(0, curH, 0, 0), MyGUI::Align::Default);
button->setProperty("ImageHighlighted", "textures\\menu_" + *it + "_over.dds"); button->setProperty("ImageHighlighted", "textures\\menu_" + *it + "_over.dds");
button->setProperty("ImageNormal", "textures\\menu_" + *it + ".dds"); button->setProperty("ImageNormal", "textures\\menu_" + *it + ".dds");
button->setProperty("ImagePushed", "textures\\menu_" + *it + "_pressed.dds"); button->setProperty("ImagePushed", "textures\\menu_" + *it + "_pressed.dds");
MyGUI::IntSize requested = button->getRequestedSize();
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::onButtonClicked); button->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::onButtonClicked);
button->setUserData(std::string(*it));
mButtons[*it] = button; mButtons[*it] = button;
curH += requested.height; }
}
// Start by hiding all buttons
int maxwidth = 0;
for (std::map<std::string, MWGui::ImageButton*>::iterator it = mButtons.begin(); it != mButtons.end(); ++it)
{
it->second->setVisible(false);
MyGUI::IntSize requested = it->second->getRequestedSize();
if (requested.width > maxwidth) if (requested.width > maxwidth)
maxwidth = requested.width; maxwidth = requested.width;
} }
for (std::map<std::string, MWGui::ImageButton*>::iterator it = mButtons.begin(); it != mButtons.end(); ++it)
// Now show and position the ones we want
for (std::vector<std::string>::iterator it = buttons.begin(); it != buttons.end(); ++it)
{ {
MyGUI::IntSize requested = it->second->getRequestedSize(); assert(mButtons.find(*it) != mButtons.end());
it->second->setCoord((maxwidth-requested.width) / 2, it->second->getTop(), requested.width, requested.height); MWGui::ImageButton* button = mButtons[*it];
button->setVisible(true);
MyGUI::IntSize requested = button->getRequestedSize();
button->setCoord((maxwidth-requested.width) / 2, curH, requested.width, requested.height);
curH += requested.height;
} }
mButtonBox->setCoord (mWidth/2 - maxwidth/2, mHeight/2 - curH/2, maxwidth, curH); mButtonBox->setCoord (mWidth/2 - maxwidth/2, mHeight/2 - curH/2, maxwidth, curH);