[vlc-commits] commit: skins2: don't resize video if set up not to do so. (Erwan Tulou )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Erwan Tulou <erwan10 at videolan.org> | Sat Aug 14 11:49:18 2010 +0200| [c873d764562ed1dd0bcfe81a28b63c2cde0ef4c3] | committer: Erwan Tulou 

skins2: don't resize video if set up not to do so.

This bug has become more conspicuous in vlc1.2, because of some enhancement in
 the vout reuse (width/height no longer a limitation)
(cherry picked from commit 9346f23dd752eabf9c79bb588c267314d3fe34d9)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=c873d764562ed1dd0bcfe81a28b63c2cde0ef4c3
---

 modules/gui/skins2/controls/ctrl_video.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/gui/skins2/controls/ctrl_video.cpp b/modules/gui/skins2/controls/ctrl_video.cpp
index 823cac4..c079f98 100644
--- a/modules/gui/skins2/controls/ctrl_video.cpp
+++ b/modules/gui/skins2/controls/ctrl_video.cpp
@@ -122,6 +122,9 @@ void CtrlVideo::unsetLayout()
 
 void CtrlVideo::resizeControl( int width, int height )
 {
+    if( !m_bAutoResize )
+        return;
+
     WindowManager &rWindowManager =
         getIntf()->p_sys->p_theme->getWindowManager();