Commit 4166f7e8 authored by Erwan Tulou's avatar Erwan Tulou

skins2: reuse graphics from generic bitmap cache (radialslider)

parent 91cbdf85
...@@ -40,17 +40,11 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf, ...@@ -40,17 +40,11 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
VarBool *pVisible ): VarBool *pVisible ):
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_position( 0 ), m_cmdUpDown( this ), m_cmdDownUp( this ), m_position( 0 ),
m_cmdMove( this ) m_width( rBmpSeq.getWidth() ), m_height( rBmpSeq.getHeight() / numImg ),
m_pImgSeq( rBmpSeq.getGraphics() ),
m_cmdUpDown( this ), m_cmdDownUp( this ), m_cmdMove( this )
{ {
// Build the images of the sequence
m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics(
rBmpSeq.getWidth(), rBmpSeq.getHeight() );
m_pImgSeq->drawBitmap( rBmpSeq, 0, 0 );
m_width = rBmpSeq.getWidth();
m_height = rBmpSeq.getHeight() / numImg;
// States // States
m_fsm.addState( "up" ); m_fsm.addState( "up" );
m_fsm.addState( "down" ); m_fsm.addState( "down" );
...@@ -71,7 +65,6 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf, ...@@ -71,7 +65,6 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
CtrlRadialSlider::~CtrlRadialSlider() CtrlRadialSlider::~CtrlRadialSlider()
{ {
m_rVariable.delObserver( this ); m_rVariable.delObserver( this );
delete m_pImgSeq;
} }
......
...@@ -76,9 +76,7 @@ private: ...@@ -76,9 +76,7 @@ private:
/// The last received event /// The last received event
EvtGeneric *m_pEvt; EvtGeneric *m_pEvt;
/// Sequence of images /// Sequence of images
OSGraphics *m_pImgSeq; const OSGraphics * const m_pImgSeq;
/// Last saved position
int m_lastPos;
/// Callback objects /// Callback objects
DEFINE_CALLBACK( CtrlRadialSlider, UpDown ) DEFINE_CALLBACK( CtrlRadialSlider, UpDown )
......
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