Commit 07bf40d5 authored by Erwan Tulou's avatar Erwan Tulou
Browse files

skins2: fix video autoresize default when contradictory

when parameters for a video control are contradictory (this occurs when the
skin developper only relies on default values), it is better not to resize,
since there is no easy means to check if the layout is really set up to handle
resizing properly.

This fixes some ugly behavior for a few skins from the skin repository
 on the website.
parent 28856b8c
......@@ -1028,12 +1028,19 @@ void Builder::addVideo( const BuilderData::Video &rData )
pVisible );
m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pVideo );
// if autoresize is true, force the control to resize
BuilderData::Video Data = rData;
if( rData.m_autoResize )
if( Data.m_autoResize )
{
Data.m_leftTop = "lefttop";
Data.m_rightBottom = "rightbottom";
// force autoresize to false if the control is not able to
// freely resize within its container
if( Data.m_xKeepRatio || Data.m_yKeepRatio ||
!( Data.m_leftTop == "lefttop" &&
Data.m_rightBottom == "rightbottom" ) )
{
msg_Err( getIntf(),
"video: resize policy and autoresize are not compatible" );
Data.m_autoResize = false;
}
}
// Compute the position of the control
......
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