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

The screen that pushes a screen sets the pop message, not the pushed screen.

Browse Source 
This pushing screens without them needing to be aware of it.  (This will also allow
a pushed screen to replace itself with another pushed screen without having to
propagate the finalization message across; that'll make more sense if the rest of
this pans out ...)
This commit is contained in:
Glenn Maynard
2005-07-18 02:28:16 +00:00
parent d2e4190a4e
commit 5ee52b0db5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+3 -1
View File
@@ -138,6 +138,7 @@ void ScreenManager::Update( float fDeltaTime )
ls.m_pScreen->HandleScreenMessage( SM_LoseFocus ); ls.m_pScreen->HandleScreenMessage( SM_LoseFocus );
SendMessageToTopScreen( SM ); SendMessageToTopScreen( SM );
SendMessageToTopScreen( ls.m_SendOnPop );
SendMessageToTopScreen( SM_GainFocus ); SendMessageToTopScreen( SM_GainFocus );
if( ls.m_bDeleteWhenDone ) if( ls.m_bDeleteWhenDone )
@@ -435,7 +436,7 @@ void ScreenManager::ClearScreenStack()
} }
/* Add a screen to m_ScreenStack. This is the only function that adds to m_ScreenStack. */ /* Add a screen to m_ScreenStack. This is the only function that adds to m_ScreenStack. */
void ScreenManager::PushScreen( Screen *pNewScreen, bool bDeleteWhenDone ) void ScreenManager::PushScreen( Screen *pNewScreen, bool bDeleteWhenDone, ScreenMessage SendOnPop )
{ {
if( m_ScreenStack.size() ) if( m_ScreenStack.size() )
m_ScreenStack.back().m_pScreen->HandleScreenMessage( SM_LoseFocus ); m_ScreenStack.back().m_pScreen->HandleScreenMessage( SM_LoseFocus );
@@ -443,6 +444,7 @@ void ScreenManager::PushScreen( Screen *pNewScreen, bool bDeleteWhenDone )
LoadedScreen ls; LoadedScreen ls;
ls.m_pScreen = pNewScreen; ls.m_pScreen = pNewScreen;
ls.m_bDeleteWhenDone = bDeleteWhenDone; ls.m_bDeleteWhenDone = bDeleteWhenDone;
ls.m_SendOnPop = SendOnPop;
m_ScreenStack.push_back( ls ); m_ScreenStack.push_back( ls );
pNewScreen->BeginScreen(); pNewScreen->BeginScreen();
stepmania/src/ScreenManager.h
+2 -1
View File
@@ -42,7 +42,7 @@ public:
bool ConcurrentlyPrepareScreen( const CString &sScreenName, ScreenMessage send_when_done = SM_None ); bool ConcurrentlyPrepareScreen( const CString &sScreenName, ScreenMessage send_when_done = SM_None );
bool IsConcurrentlyLoading() const; bool IsConcurrentlyLoading() const;
void DeletePreparedScreens(); void DeletePreparedScreens();
void PushScreen( Screen *pNewScreen, bool bDeleteWhenDone=false ); void PushScreen( Screen *pNewScreen, bool bDeleteWhenDone=false, ScreenMessage SendOnPop=SM_None );
void PopTopScreen( ScreenMessage SM ); void PopTopScreen( ScreenMessage SM );
Screen *GetTopScreen(); Screen *GetTopScreen();
@@ -78,6 +78,7 @@ private:
{ {
Screen *m_pScreen; Screen *m_pScreen;
bool m_bDeleteWhenDone; bool m_bDeleteWhenDone;
ScreenMessage m_SendOnPop;
}; };
vector<LoadedScreen> m_ScreenStack; // bottommost to topmost vector<LoadedScreen> m_ScreenStack; // bottommost to topmost
vector<Screen*> m_OverlayScreens; vector<Screen*> m_OverlayScreens;