Commit 980861af authored by dionoea's avatar dionoea
Browse files

Restore the interface when it's minimized and you click on the systray icon.

parent e116212b
...@@ -186,9 +186,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -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 */ /* It is also connected to the control->slider, see the ControlsWidget */
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, setDisplayPosition( float, int, int ) ); this, setDisplayPosition( float, int, int ) );
CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) ); CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
/** Connects on nameChanged() */ /** Connects on nameChanged() */
/* Naming in the controller statusbar */ /* Naming in the controller statusbar */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
...@@ -740,7 +740,7 @@ void MainInterface::createSystray() ...@@ -740,7 +740,7 @@ void MainInterface::createSystray()
QVLCMenu::updateSystrayMenu( this, p_intf, true ); QVLCMenu::updateSystrayMenu( this, p_intf, true );
sysTray->show(); sysTray->show();
CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ), CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) ); this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
} }
...@@ -764,6 +764,11 @@ void MainInterface::toggleUpdateSystrayMenu() ...@@ -764,6 +764,11 @@ void MainInterface::toggleUpdateSystrayMenu()
show(); show();
activateWindow(); activateWindow();
} }
else if( isMinimized() )
{
showNormal();
activateWindow();
}
else else
{ {
#ifdef WIN32 #ifdef WIN32
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment