vlc | branch: master | Erwan Tulou <[email protected]> | Wed Jun 27 12:03:39 2012 +0200| [380d67a925d82cb6423adf0356dc12807c0406b2] | committer: Erwan Tulou
skins2: add support for --[no]-qt-fs-controller > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=380d67a925d82cb6423adf0356dc12807c0406b2 --- modules/gui/skins2/src/fsc_window.cpp | 6 ++++++ modules/gui/skins2/src/fsc_window.hpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/modules/gui/skins2/src/fsc_window.cpp b/modules/gui/skins2/src/fsc_window.cpp index e8eb60b..6d7df7e 100644 --- a/modules/gui/skins2/src/fsc_window.cpp +++ b/modules/gui/skins2/src/fsc_window.cpp @@ -62,6 +62,9 @@ FscWindow::FscWindow( intf_thread_t *pIntf, int left, int top, if( m_delay <= 0 ) m_delay = FSC_DELAY; + /// activation overridden by user + m_enabled = var_InheritBool( getIntf(), "qt-fs-controller" ); + // register Fsc VoutManager::instance( getIntf())->registerFSC( this ); } @@ -157,6 +160,9 @@ void FscWindow::onUpdate( Subject<VarBool> &rVariable, void *arg ) void FscWindow::innerShow() { + if( !m_enabled ) + return; + TopWindow::innerShow(); m_count = FSC_COUNT; diff --git a/modules/gui/skins2/src/fsc_window.hpp b/modules/gui/skins2/src/fsc_window.hpp index 67f9b98..7221039 100644 --- a/modules/gui/skins2/src/fsc_window.hpp +++ b/modules/gui/skins2/src/fsc_window.hpp @@ -69,6 +69,8 @@ private: int m_opacity; /// delay set by user int m_delay; + /// activation set by user + bool m_enabled; /// Callback for the timer DEFINE_CALLBACK( FscWindow, FscHide ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
