mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

TWK-604: Update Show/Hide menu entry if Tomahawk is hidden with Cmd-H

Browse Source
This commit is contained in:
Leo Franchi
2012-02-26 12:44:19 -05:00
parent 56c2f86381
commit e9fb17dadb
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tomahawktrayicon.cpp
View File

@@ -58,6 +58,8 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) ); m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) );
m_showWindowAction->setData( true ); m_showWindowAction->setData( true );
connect( m_showWindowAction, SIGNAL( triggered() ), this, SLOT( showWindow() ) ); connect( m_showWindowAction, SIGNAL( triggered() ), this, SLOT( showWindow() ) );
connect( m_contextMenu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) );
#endif #endif
m_contextMenu->addSeparator(); m_contextMenu->addSeparator();
@@ -118,6 +120,16 @@ TomahawkTrayIcon::showWindow()
} }
void
TomahawkTrayIcon::menuAboutToShow()
{
// When using Cmd-H on mac to hide a window, it is an OS-level hide that is different from QWidget::hide().
// Qt returns isVisible() == true for windows that are hidden with Cmd-H, which is weird. isActiveWindow() returns
// the proper information though.
setShowHideWindow( APP->mainWindow()->isActiveWindow() );
}
void void
TomahawkTrayIcon::setResult( const Tomahawk::result_ptr& result ) TomahawkTrayIcon::setResult( const Tomahawk::result_ptr& result )
{ {

1
src/tomahawktrayicon.h
View File

@@ -46,6 +46,7 @@ private slots:
void enablePlay(); void enablePlay();
void enablePause(); void enablePause();
void menuAboutToShow();
private: private:
void refreshToolTip(); void refreshToolTip();
~TomahawkTrayIcon(); ~TomahawkTrayIcon();