From: Erwan Tulou <erwan10@videolan.org>
Date: Sat, 14 Aug 2010 09:49:18 +0000 (+0200)
Subject: skins2: don't resize video if set up not to do so.
X-Git-Tag: 1.2.0-pre1~5433
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9346f23dd752eabf9c79bb588c267314d3fe34d9;hp=07bf40d589a3f4fa9a608c50d7599b8b9b7059bf;p=vlc

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)
---

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