[vlc-commits] commit: Qt: fix switching to minimalView behaviour (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr  7 15:02:42 2010 +0200| [e4f5b367ce7a667939f3c8a5f7d7adace833c669] | committer: Jean-Baptiste Kempf 

Qt: fix switching to minimalView behaviour

Especially when playlist is opened.

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

 modules/gui/qt4/main_interface.cpp |   32 ++++++--------------------------
 1 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 13c4555..b3b1b52 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -734,22 +734,13 @@ void MainInterface::dockPlaylist( bool p_docked )
 void MainInterface::toggleMinimalView( bool b_switch )
 {
     if( i_visualmode == 0 )
-    { /* NORMAL MODE then */
-        if( !videoWidget || stackCentralW->currentWidget() != videoWidget )
-        {
-            showBg();
-        }
-        else
+    {
+        if( stackCentralW->currentWidget() == bgWidget )
         {
-            /* If video is visible, then toggle the status of bgWidget */
-            //FIXME
-            //bgWasVisible = !bgWasVisible;
-            /* if( stackCentralOldState == BACK G_TAB )
-                stackCentralOldState = HID DEN_TAB;
-            else
-                stackCentralOldState = BACK G_TAB;
-
-                */
+            if( stackCentralW->height() < 16 )
+            {
+                resizeStack( stackCentralW->width(), 100 );
+            }
         }
     }
 
@@ -1055,17 +1046,6 @@ void MainInterface::dragLeaveEvent(QDragLeaveEvent *event)
  ************************************************************************/
 void MainInterface::customEvent( QEvent *event )
 {
-#if 0
-    if( event->type() == PLDockEvent_Type )
-    {
-        PlaylistDialog::killInstance();
-        playlistEmbeddedFlag = true;
-        menuBar()->clear();
-        QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled);
-        togglePlaylist();
-    }
-#endif
-    /*else */
     if ( event->type() == (int)SetVideoOnTopEvent_Type )
     {
         SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;