mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Workaround keyfocus issues in current versions of MyGUI

Browse Source
This commit is contained in:
scrawl 2017-09-26 19:22:23 +02:00
parent b9341925f2
commit 475ac46f3e
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
apps/openmw/mwgui/keyboardnavigation.cpp
View File

@ -4,6 +4,7 @@
#include <MyGUI_WidgetManager.h> #include <MyGUI_WidgetManager.h>
#include <MyGUI_Button.h> #include <MyGUI_Button.h>
#include <MyGUI_Gui.h> #include <MyGUI_Gui.h>
#include <MyGUI_Window.h>
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -30,7 +31,13 @@ void getKeyFocusWidgets(MyGUI::Widget* parent, std::vector<MyGUI::Widget*>& resu
} }
} }
bool shouldAcceptKeyFocus(MyGUI::Widget* w)
{
return w && !w->castType<MyGUI::Window>(false) && w->getInheritedEnabled() && w->getInheritedVisible() && w->getVisible() && w->getEnabled();
}
KeyboardNavigation::KeyboardNavigation() KeyboardNavigation::KeyboardNavigation()
: mCurrentFocus(nullptr)
{ {
MyGUI::WidgetManager::getInstance().registerUnlinker(this); MyGUI::WidgetManager::getInstance().registerUnlinker(this);
} }
@ -42,7 +49,11 @@ KeyboardNavigation::~KeyboardNavigation()
void KeyboardNavigation::saveFocus(int mode) void KeyboardNavigation::saveFocus(int mode)
{ {
mKeyFocus[mode] = MyGUI::InputManager::getInstance().getKeyFocusWidget(); MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
if (shouldAcceptKeyFocus(focus))
mKeyFocus[mode] = focus;
else
mKeyFocus[mode] = mCurrentFocus;
} }
void KeyboardNavigation::restoreFocus(int mode) void KeyboardNavigation::restoreFocus(int mode)
@ -61,6 +72,51 @@ void KeyboardNavigation::_unlinkWidget(MyGUI::Widget *widget)
for (std::pair<const int, MyGUI::Widget*>& w : mKeyFocus) for (std::pair<const int, MyGUI::Widget*>& w : mKeyFocus)
if (w.second == widget) if (w.second == widget)
w.second = nullptr; w.second = nullptr;
if (widget == mCurrentFocus)
mCurrentFocus = nullptr;
}
void styleFocusedButton(MyGUI::Widget* w)
{
if (w)
{
if (MyGUI::Button* b = w->castType<MyGUI::Button>(false))
{
b->_setWidgetState("highlighted");
}
}
}
void KeyboardNavigation::onFrame()
{
MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
if (focus == mCurrentFocus)
{
styleFocusedButton(mCurrentFocus);
return;
}
// workaround incorrect key focus resets (fix in MyGUI TBD)
if (!shouldAcceptKeyFocus(focus) && shouldAcceptKeyFocus(mCurrentFocus))
{
MyGUI::InputManager::getInstance().setKeyFocusWidget(mCurrentFocus);
focus = mCurrentFocus;
}
// style highlighted button (won't be needed for MyGUI 3.2.3)
if (focus != mCurrentFocus)
{
if (mCurrentFocus)
{
if (MyGUI::Button* b = mCurrentFocus->castType<MyGUI::Button>(false))
b->_setWidgetState("normal");
}
mCurrentFocus = focus;
}
styleFocusedButton(mCurrentFocus);
} }
enum Direction enum Direction

4
apps/openmw/mwgui/keyboardnavigation.hpp
View File

@ -21,6 +21,8 @@ namespace MWGui
void _unlinkWidget(MyGUI::Widget* widget); void _unlinkWidget(MyGUI::Widget* widget);
void onFrame();
private: private:
bool switchFocus(int direction, bool wrap); bool switchFocus(int direction, bool wrap);
@ -28,6 +30,8 @@ namespace MWGui
bool accept(); bool accept();
std::map<int, MyGUI::Widget*> mKeyFocus; std::map<int, MyGUI::Widget*> mKeyFocus;
MyGUI::Widget* mCurrentFocus;
}; };
} }

2
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -866,6 +866,8 @@ namespace MWGui
if (!mCurrentModals.empty()) if (!mCurrentModals.empty())
mCurrentModals.top()->onFrame(frameDuration); mCurrentModals.top()->onFrame(frameDuration);
mKeyboardNavigation->onFrame();
mMessageBoxManager->onFrame(frameDuration); mMessageBoxManager->onFrame(frameDuration);
mToolTips->onFrame(frameDuration); mToolTips->onFrame(frameDuration);