Commit 2b208ebc authored by Cyril Deguet's avatar Cyril Deguet

* ctrl_text.cpp: put the control text in the "moving" state initially

parent 3ef2227a
...@@ -80,7 +80,7 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable, ...@@ -80,7 +80,7 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
m_fsm.addTransition( "outMoving", "enter", "moving" ); m_fsm.addTransition( "outMoving", "enter", "moving" );
// Initial state // Initial state
m_fsm.setState( "outStill" ); m_fsm.setState( "moving" );
// Observe the variable // Observe the variable
m_rVariable.addObserver( this ); m_rVariable.addObserver( this );
...@@ -210,6 +210,8 @@ void CtrlText::displayText( const UString &rText ) ...@@ -210,6 +210,8 @@ void CtrlText::displayText( const UString &rText )
onChangePosition(); onChangePosition();
m_xPos = 0; m_xPos = 0;
if( getPosition() )
{
// If the control was in the moving state, check if the scrolling is // If the control was in the moving state, check if the scrolling is
// still necessary // still necessary
const string &rState = m_fsm.getState(); const string &rState = m_fsm.getState();
...@@ -225,8 +227,8 @@ void CtrlText::displayText( const UString &rText ) ...@@ -225,8 +227,8 @@ void CtrlText::displayText( const UString &rText )
m_pTimer->stop(); m_pTimer->stop();
} }
} }
notifyLayout(); notifyLayout();
}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment