Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted the changes of revision 5458.

Browse Source 
The problem with the single click on the systemtray icon only occurs when using the Windows tool Taskbar Shuffle.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-08-31 13:29:49 +00:00
parent 72c2699d9f
commit ca1055da90
1 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -156,43 +156,6 @@
/*static*/ MainWindow *MainWindow::_instance = NULL; /*static*/ MainWindow *MainWindow::_instance = NULL;
#ifdef WINDOWS_SYS
#if QT_VERSION >= 0x040700
#define INSTALL_SYSTRAYICON_EVENT
QCoreApplication::EventFilter g_eventFilter = NULL;
// Fix problem with single click on a systemtray icon in Qt 4.7 or above running on Windows XP or lower
// - before Qt 4.7.0 the message MYWM_NOTIFYICON/WM_LBUTTONUP was handled to emit activted(QSystemTrayIcon::Trigger)
// - after Qt 4.7.0 the message MYWM_NOTIFYICON/NIN_SELECT is handled. This message is not sent in Windows XP
// Solution: set an event filter and modify the message from WM_LBUTTONUP to NIN_SELECT
// taken from qsystemtrayicon_win.cpp
#define MYWM_NOTIFYICON (WM_APP+101)
#ifndef NIN_SELECT
#define NIN_SELECT (WM_USER + 0)
#endif
bool sysTrayIconEventFilter(void *message, long *result)
{
MSG *msg = (MSG*) message;
if (msg->message == MYWM_NOTIFYICON) {
if (msg->lParam == WM_LBUTTONUP) {
msg->lParam = NIN_SELECT;
return false;
}
}
if (g_eventFilter)
return g_eventFilter(message, result);
return false;
}
#endif // QT_VERSION >= 0x040700
#endif // WINDOWS_SYS
/** create main window */ /** create main window */
/*static*/ MainWindow *MainWindow::Create () /*static*/ MainWindow *MainWindow::Create ()
{ {
@ -216,13 +179,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Invoke the Qt Designer generated QObject setup routine */ /* Invoke the Qt Designer generated QObject setup routine */
ui.setupUi(this); ui.setupUi(this);
#ifdef INSTALL_SYSTRAYICON_EVENT
if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA) {
std::cerr << "Running Windows XP or older, install systemtray icon event filter" << std::endl;
g_eventFilter = qApp->setEventFilter(sysTrayIconEventFilter);
}
#endif
_instance = this; _instance = this;
m_bStatusLoadDone = false; m_bStatusLoadDone = false;