ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add focus callback to GUI engine

Browse Source
This commit is contained in:
Marianne Gagnon 2015-01-15 20:18:31 -05:00
parent d3708ba798
commit 84821ad604
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/guiengine/screen.hpp
View File

@ -311,6 +311,9 @@ namespace GUIEngine
* Can be used to set focus for instance. * Can be used to set focus for instance.
*/ */
virtual void onDialogClose() {} virtual void onDialogClose() {}
/** Callback called when focus changes */
virtual void onFocusChanged(Widget* previous, Widget* focus, int playerID) {}
}; };
class CutsceneScreen : public Screen class CutsceneScreen : public Screen

10
src/guiengine/widget.cpp
View File

@ -255,10 +255,11 @@ void Widget::setFocusForPlayer(const int playerID)
assert(m_magic_number == 0xCAFEC001); assert(m_magic_number == 0xCAFEC001);
// Unset focus flag on previous widget that had focus // Unset focus flag on previous widget that had focus
if (GUIEngine::getFocusForPlayer(playerID) != NULL) Widget* previous_focus = GUIEngine::getFocusForPlayer(playerID);
if (previous_focus != NULL)
{ {
GUIEngine::getFocusForPlayer(playerID)->unfocused(playerID, this); previous_focus->unfocused(playerID, this);
GUIEngine::getFocusForPlayer(playerID)->m_player_focus[playerID] = false; previous_focus->m_player_focus[playerID] = false;
} }
m_player_focus[playerID] = true; m_player_focus[playerID] = true;
@ -266,6 +267,9 @@ void Widget::setFocusForPlayer(const int playerID)
// Callback // Callback
this->focused(playerID); this->focused(playerID);
Screen* screen = GUIEngine::getCurrentScreen();
screen->onFocusChanged(previous_focus, this, playerID);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------