]> git.sesse.net Git - vlc/commitdiff
Restore the interface when it's minimized and you click on the systray icon.
authorAntoine Cellerier <dionoea@videolan.org>
Sun, 9 Sep 2007 19:59:52 +0000 (19:59 +0000)
committerAntoine Cellerier <dionoea@videolan.org>
Sun, 9 Sep 2007 19:59:52 +0000 (19:59 +0000)
modules/gui/qt4/main_interface.cpp

index f2ea88f5b49a04576f7a81cb1e9c7ff080d91391..18625a2fe3d5c4256e38673c95e7865774bf65cc 100644 (file)
@@ -186,9 +186,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /* It is also connected to the control->slider, see the ControlsWidget */
     CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
              this, setDisplayPosition( float, int, int ) );
-    
+
     CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
-    
+
     /** Connects on nameChanged() */
     /* Naming in the controller statusbar */
     CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
@@ -740,7 +740,7 @@ void MainInterface::createSystray()
     QVLCMenu::updateSystrayMenu( this, p_intf, true );
     sysTray->show();
 
-    CONNECT( sysTray, activated(  QSystemTrayIcon::ActivationReason ),
+    CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
             this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
 }
 
@@ -764,6 +764,11 @@ void MainInterface::toggleUpdateSystrayMenu()
         show();
         activateWindow();
     }
+    else if( isMinimized() )
+    {
+        showNormal();
+        activateWindow();
+    }
     else
     {
 #ifdef WIN32