[vlc-commits] skins2: first check for playout existence (generic control)
Erwan Tulou
git at videolan.org
Mon Apr 8 11:56:24 CEST 2013
vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Mon Apr 8 11:49:13 2013 +0200| [01d9858c2ed3094a1d8e64f624a66f27d10c4e84] | committer: Erwan Tulou
skins2: first check for playout existence (generic control)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01d9858c2ed3094a1d8e64f624a66f27d10c4e84
---
modules/gui/skins2/controls/ctrl_generic.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/skins2/controls/ctrl_generic.cpp b/modules/gui/skins2/controls/ctrl_generic.cpp
index 7bded8c..c821b08 100644
--- a/modules/gui/skins2/controls/ctrl_generic.cpp
+++ b/modules/gui/skins2/controls/ctrl_generic.cpp
@@ -76,12 +76,12 @@ void CtrlGeneric::unsetLayout()
void CtrlGeneric::notifyLayout( int width, int height,
int xOffSet, int yOffSet )
{
- width = ( width > 0 ) ? width : m_pPosition->getWidth();
- height = ( height > 0 ) ? height : m_pPosition->getHeight();
-
// Notify the layout
if( m_pLayout )
{
+ width = ( width > 0 ) ? width : m_pPosition->getWidth();
+ height = ( height > 0 ) ? height : m_pPosition->getHeight();
+
m_pLayout->onControlUpdate( *this, width, height, xOffSet, yOffSet );
}
}
More information about the vlc-commits
mailing list