Commit 5bb0b91a authored by Erwan Tulou's avatar Erwan Tulou

skins2: Oops, autoresize (part 2)

this patch completes 07bf40d5
(cherry picked from commit 8079da51)
parent c873d764
...@@ -1014,16 +1014,6 @@ void Builder::addVideo( const BuilderData::Video &rData ) ...@@ -1014,16 +1014,6 @@ void Builder::addVideo( const BuilderData::Video &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
CtrlVideo *pVideo = new CtrlVideo( getIntf(), *pLayout,
rData.m_autoResize, UString( getIntf(), rData.m_help.c_str() ),
pVisible );
m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pVideo );
BuilderData::Video Data = rData; BuilderData::Video Data = rData;
if( Data.m_autoResize ) if( Data.m_autoResize )
{ {
...@@ -1039,6 +1029,16 @@ void Builder::addVideo( const BuilderData::Video &rData ) ...@@ -1039,6 +1029,16 @@ void Builder::addVideo( const BuilderData::Video &rData )
} }
} }
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( Data.m_visible, m_pTheme );
CtrlVideo *pVideo = new CtrlVideo( getIntf(), *pLayout,
Data.m_autoResize, UString( getIntf(), Data.m_help.c_str() ),
pVisible );
m_pTheme->m_controls[Data.m_id] = CtrlGenericPtr( pVideo );
// Compute the position of the control // Compute the position of the control
const GenericRect *pRect; const GenericRect *pRect;
GET_BOX( pRect, rData.m_panelId , pLayout); GET_BOX( pRect, rData.m_panelId , pLayout);
...@@ -1048,7 +1048,7 @@ void Builder::addVideo( const BuilderData::Video &rData ) ...@@ -1048,7 +1048,7 @@ void Builder::addVideo( const BuilderData::Video &rData )
*pRect, *pRect,
Data.m_xKeepRatio, Data.m_yKeepRatio ); Data.m_xKeepRatio, Data.m_yKeepRatio );
pLayout->addControl( pVideo, pos, rData.m_layer ); pLayout->addControl( pVideo, pos, Data.m_layer );
} }
......
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