actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

"Send this before making the new screen, since it might set things that will be

Browse Source 
re-set in the new screen's ctor."  Don't do that--don't assume that the old
LoseFocus will be called before the ctor or Init.  If you're doing something that
interacts with state changed by focus, do it in the first update, when you're
guaranteed to have focus.  Make no guarantees about who has focus when
a new screen is constructed; only that LoseFocus will be sent before GainFocus,
and GainFocus before the first update.
This commit is contained in:
Glenn Maynard
2005-07-03 04:24:57 +00:00
parent 14a3b69f84
commit b0a079c777
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+3 -14
View File
@@ -339,6 +339,9 @@ void ScreenManager::ClearScreenStack()
/* Add a screen to m_ScreenStack. This is the only function that adds to m_ScreenStack. */
void ScreenManager::SetFromNewScreen( Screen *pNewScreen )
{
if( m_ScreenStack.size() )
m_ScreenStack.back()->HandleScreenMessage( SM_LoseFocus );
m_ScreenStack.push_back( pNewScreen );
RefreshCreditsMessages();
@@ -440,11 +443,6 @@ void ScreenManager::AddNewScreenToTop( const CString &sScreenName )
{
m_bZeroNextUpdate = true;
/* Send this before making the new screen, since it might set things that will be re-set
* in the new screen's ctor. */
if( m_ScreenStack.size() )
m_ScreenStack.back()->HandleScreenMessage( SM_LoseFocus );
Screen* pNewScreen = MakeNewScreen(sScreenName);
SetFromNewScreen( pNewScreen );
}
@@ -455,9 +453,6 @@ void ScreenManager::AddNewScreenToTop( const CString &sScreenName )
void ScreenManager::Prompt( ScreenMessage smSendOnPop, const CString &sText, PromptType type, PromptAnswer defaultAnswer, void(*OnYes)(void*), void(*OnNo)(void*), void* pCallbackData )
{
if( m_ScreenStack.size() )
m_ScreenStack.back()->HandleScreenMessage( SM_LoseFocus );
// add the new state onto the back of the array
ScreenPrompt *pNewScreen = new ScreenPrompt( "ScreenPrompt" );
pNewScreen->Init();
@@ -477,9 +472,6 @@ void ScreenManager::TextEntry(
bool bPassword
)
{
if( m_ScreenStack.size() )
m_ScreenStack.back()->HandleScreenMessage( SM_LoseFocus );
// add the new state onto the back of the array
Screen *pNewScreen = new ScreenTextEntry(
"ScreenTextEntry",
@@ -498,9 +490,6 @@ void ScreenManager::TextEntry(
void ScreenManager::MiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel )
{
if( m_ScreenStack.size() )
m_ScreenStack.back()->HandleScreenMessage( SM_LoseFocus );
// add the new state onto the back of the array
ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName );
pNewScreen->Init( pDef, SM_SendOnOK, SM_SendOnCancel );