mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 14:19:41 +00:00
Code Issues Releases Wiki Activity

Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button

Browse source
This commit is contained in:
Digmaster 2014-05-29 06:19:25 -04:00
parent a5cfa8a049
commit 03d7137655
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/dialogue.cpp
View file

@ -518,11 +518,9 @@ namespace MWGui
MyGUI::Button* byeButton; MyGUI::Button* byeButton;
getWidget(byeButton, "ByeButton"); getWidget(byeButton, "ByeButton");
if(MWBase::Environment::get().getDialogueManager()->isInChoice()) { if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
byeButton->setAlpha(.2);
byeButton->setEnabled(false); byeButton->setEnabled(false);
} }
else { else {
byeButton->setAlpha(1);
byeButton->setEnabled(true); byeButton->setEnabled(true);
} }
} }

8
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -791,8 +791,12 @@ namespace MWInput
if (!MWBase::Environment::get().getWindowManager()->isGuiMode () if (!MWBase::Environment::get().getWindowManager()->isGuiMode ()
&& MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")==-1) && MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")==-1)
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu); MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu);
else if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu) else if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu) {
MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_QuickKeysMenu); while(MyGUI::InputManager::getInstance().isModalAny()) { //Handle any open Modal windows
MWBase::Environment::get().getWindowManager()->getCurrentModal()->exit();
}
MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode(); //And handle the actual main window
}
} }
void InputManager::activate() void InputManager::activate()