Commit f6a67e80 authored by Erwan Tulou's avatar Erwan Tulou

skins2: fix RadialSlider

    - fix several parameters wrongly spelled (case sensitive)
     (led to crash in atof)
    - fix uninitialized m_position variable
(cherry picked from commit a2bd0738)
parent 662f4211
...@@ -41,7 +41,7 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf, ...@@ -41,7 +41,7 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_numImg( numImg ), CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_numImg( numImg ),
m_rVariable( rVariable ), m_minAngle( minAngle ), m_maxAngle( maxAngle ), m_rVariable( rVariable ), m_minAngle( minAngle ), m_maxAngle( maxAngle ),
m_cmdUpDown( this ), m_cmdDownUp( this ), m_cmdUpDown( this ), m_cmdDownUp( this ),
m_cmdMove( this ) m_cmdMove( this ), m_position( 0 )
{ {
// Build the images of the sequence // Build the images of the sequence
m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics( m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics(
......
...@@ -458,8 +458,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -458,8 +458,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
attr["lefttop"], attr["rightbottom"], attr["lefttop"], attr["rightbottom"],
convertBoolean( attr["xkeepratio"] ), convertBoolean( attr["xkeepratio"] ),
convertBoolean( attr["ykeepratio"] ), attr["sequence"], convertBoolean( attr["ykeepratio"] ), attr["sequence"],
atoi( attr["nbImages"] ), atof( attr["minAngle"] ) * M_PI /180, atoi( attr["nbimages"] ), atof( attr["minangle"] ) * M_PI /180,
atof( attr["maxAngle"] ) * M_PI / 180, attr["value"], atof( attr["maxangle"] ) * M_PI / 180, attr["value"],
attr["tooltiptext"], attr["help"], m_curLayer, m_curWindowId, attr["tooltiptext"], attr["help"], m_curLayer, m_curWindowId,
m_curLayoutId, m_panelStack.back() ); m_curLayoutId, m_panelStack.back() );
m_curLayer++; m_curLayer++;
......
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