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,
m_fsm.addTransition( "outMoving", "enter", "moving" );
// Initial state
m_fsm.setState( "outStill" );
m_fsm.setState( "moving" );
// Observe the variable
m_rVariable.addObserver( this );
......@@ -210,23 +210,25 @@ void CtrlText::displayText( const UString &rText )
onChangePosition();
m_xPos = 0;
// If the control was in the moving state, check if the scrolling is
// still necessary
const string &rState = m_fsm.getState();
if( rState == "moving" || rState == "outMoving" )
if( getPosition() )
{
if( m_pImg && m_pImg->getWidth() >= getPosition()->getWidth() )
// If the control was in the moving state, check if the scrolling is
// still necessary
const string &rState = m_fsm.getState();
if( rState == "moving" || rState == "outMoving" )
{
m_pCurrImg = m_pImgDouble;
m_pTimer->start( MOVING_TEXT_DELAY, false );
}
else
{
m_pTimer->stop();
if( m_pImg && m_pImg->getWidth() >= getPosition()->getWidth() )
{
m_pCurrImg = m_pImgDouble;
m_pTimer->start( MOVING_TEXT_DELAY, false );
}
else
{
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