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

Select first widget if we can't find the current widget

Browse source
This commit is contained in:
scrawl 2017-09-26 19:37:33 +02:00
parent 475ac46f3e
commit 41fe16013b
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/openmw/mwgui/keyboardnavigation.cpp
View file

@ -152,19 +152,8 @@ bool KeyboardNavigation::injectKeyPress(MyGUI::KeyCode key, unsigned int text)
} }
} }
bool KeyboardNavigation::switchFocus(int direction, bool wrap) bool selectFirstWidget()
{ {
MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
if ((focus && focus->getTypeName().find("Button") == std::string::npos) && direction != D_Prev && direction != D_Next)
return false;
if (focus && (direction == D_Prev || direction == D_Next) && focus->getUserString("AcceptTab") == "true")
return false;
if ((!focus || !focus->getNeedKeyFocus()) && (direction == D_Next || direction == D_Prev))
{
// if nothing is selected, select the first widget
MyGUI::VectorWidgetPtr keyFocusList; MyGUI::VectorWidgetPtr keyFocusList;
MyGUI::EnumeratorWidgetPtr enumerator = MyGUI::Gui::getInstance().getEnumerator(); MyGUI::EnumeratorWidgetPtr enumerator = MyGUI::Gui::getInstance().getEnumerator();
while (enumerator.next()) while (enumerator.next())
@ -175,6 +164,24 @@ bool KeyboardNavigation::switchFocus(int direction, bool wrap)
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[0]); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[0]);
return true; return true;
} }
return false;
}
bool KeyboardNavigation::switchFocus(int direction, bool wrap)
{
MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
if ((focus && focus->getTypeName().find("Button") == std::string::npos) && direction != D_Prev && direction != D_Next)
return false;
bool isCycle = (direction == D_Prev || direction == D_Next);
if (focus && isCycle && focus->getUserString("AcceptTab") == "true")
return false;
if ((!focus || !focus->getNeedKeyFocus()) && isCycle)
{
// if nothing is selected, select the first widget
return selectFirstWidget();
} }
if (!focus) if (!focus)
return false; return false;
@ -190,7 +197,12 @@ bool KeyboardNavigation::switchFocus(int direction, bool wrap)
MyGUI::VectorWidgetPtr::iterator found = std::find(keyFocusList.begin(), keyFocusList.end(), focus); MyGUI::VectorWidgetPtr::iterator found = std::find(keyFocusList.begin(), keyFocusList.end(), focus);
if (found == keyFocusList.end()) if (found == keyFocusList.end())
{
if (isCycle)
return selectFirstWidget();
else
return false; return false;
}
bool forward = (direction == D_Next || direction == D_Right || direction == D_Down); bool forward = (direction == D_Next || direction == D_Right || direction == D_Down);