remove m_Background; use underlay
This commit is contained in:
@@ -34,12 +34,6 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree
|
|||||||
{
|
{
|
||||||
ScreenOptions::Init();
|
ScreenOptions::Init();
|
||||||
|
|
||||||
m_Background.Load( THEME->GetPathB(m_sName,"background") );
|
|
||||||
m_Background->SetDrawOrder( DRAW_ORDER_BEFORE_EVERYTHING );
|
|
||||||
this->AddChild( m_Background );
|
|
||||||
|
|
||||||
this->SortByDrawOrder();
|
|
||||||
|
|
||||||
m_SMSendOnOK = SM_SendOnOK;
|
m_SMSendOnOK = SM_SendOnOK;
|
||||||
m_SMSendOnCancel = SM_SendOnCancel;
|
m_SMSendOnCancel = SM_SendOnCancel;
|
||||||
m_vMenuRows = pDef->rows;
|
m_vMenuRows = pDef->rows;
|
||||||
@@ -83,13 +77,6 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree
|
|||||||
ScreenOptions::InitMenu( vDefs, vHands );
|
ScreenOptions::InitMenu( vDefs, vHands );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenMiniMenu::BeginScreen()
|
|
||||||
{
|
|
||||||
ScreenOptions::BeginScreen();
|
|
||||||
|
|
||||||
m_Background->PlayCommand( "On" );
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenMiniMenu::OnChange( PlayerNumber pn )
|
void ScreenMiniMenu::OnChange( PlayerNumber pn )
|
||||||
{
|
{
|
||||||
ScreenOptions::OnChange( pn );
|
ScreenOptions::OnChange( pn );
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ public:
|
|||||||
|
|
||||||
ScreenMiniMenu( CString sScreenClass );
|
ScreenMiniMenu( CString sScreenClass );
|
||||||
void Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel );
|
void Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel );
|
||||||
virtual void BeginScreen();
|
|
||||||
void HandleScreenMessage( const ScreenMessage SM );
|
void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -88,10 +87,6 @@ protected:
|
|||||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||||
|
|
||||||
// Screens that get pushed on top of other screens don't
|
|
||||||
// use the ScreenManager's shared background, so they must draw their own.
|
|
||||||
AutoActor m_Background;
|
|
||||||
|
|
||||||
ScreenMessage m_SMSendOnOK;
|
ScreenMessage m_SMSendOnOK;
|
||||||
ScreenMessage m_SMSendOnCancel;
|
ScreenMessage m_SMSendOnCancel;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user