From: Erwan Tulou <erwan10@videolan.org>
Date: Thu, 25 Feb 2010 10:08:39 +0000 (+0100)
Subject: skins2: extend --[no]-qt-video-autoresize to skins2
X-Git-Tag: 1.1.0-pre1~684
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=23c4cec46995dbbfd1fb1e6b7aa7fa44f35a4722;p=vlc

skins2: extend --[no]-qt-video-autoresize to skins2

As for qt4, offering the possibility to deactivate automatic resizing
is desirable. Reusing the qt parameter is not a problem for skins since
qt4 is a prerequisite.

TODO, rename this parameter with a more interface agnostic name since
the need is for all interfaces.
---

diff --git a/modules/gui/skins2/controls/ctrl_video.cpp b/modules/gui/skins2/controls/ctrl_video.cpp
index a430fedbfa..dc2e3192b8 100644
--- a/modules/gui/skins2/controls/ctrl_video.cpp
+++ b/modules/gui/skins2/controls/ctrl_video.cpp
@@ -41,6 +41,10 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
 {
     VarBool &rFullscreen = VlcProc::instance( getIntf() )->getFullscreenVar();
     rFullscreen.addObserver( this );
+
+    // if global parameter set to no resize, override skins behavior
+    if( !var_InheritBool( pIntf, "qt-video-autoresize" ) )
+        m_bAutoResize = false;
 }