[vlc-devel] commit: Fix the activation or not of advanced buttons in fullscreen controller ( Jean-Baptiste Kempf )
git version control
git at videolan.org
Fri Aug 1 23:57:40 CEST 2008
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Aug 1 14:57:39 2008 -0700| [175d1beb96ca494f8bfdee0ad488b303ef55e9ec] | committer: Jean-Baptiste Kempf
Fix the activation or not of advanced buttons in fullscreen controller
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=175d1beb96ca494f8bfdee0ad488b303ef55e9ec
---
modules/gui/qt4/components/interface_widgets.cpp | 4 +++-
modules/gui/qt4/main_interface.cpp | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index eeff71a..6ce1adb 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -889,7 +889,7 @@ void ControlsWidget::enableVideo( bool enable )
void ControlsWidget::toggleAdvanced()
{
- if( !VISIBLE( advControls ) )
+ if( advControls && !b_advancedVisible )
{
advControls->show();
b_advancedVisible = true;
@@ -961,6 +961,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
#ifdef WIN32TRICK
setWindowOpacity( 0.0 );
fscHidden = true;
+ adjustSize();
show();
#endif
@@ -977,6 +978,7 @@ FullscreenControllerWidget::~FullscreenControllerWidget()
*/
void FullscreenControllerWidget::showFSC()
{
+ adjustSize();
#ifdef WIN32TRICK
// after quiting and going to fs, we need to call show()
if( isHidden() )
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 0641b25..0ee6864 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -832,6 +832,7 @@ void MainInterface::doComponentsUpdate()
void MainInterface::toggleAdvanced()
{
controls->toggleAdvanced();
+ fullscreenControls->toggleAdvanced();
}
/* Get the visibility status of the controls (hidden or not, advanced or not) */
More information about the vlc-devel
mailing list