StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2586'

Browse Source
This commit is contained in:
tux3 2015-12-11 02:45:10 +01:00
commit f0f49e79f0
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/widget/widget.cpp
View File

@ -741,52 +741,31 @@ void Widget::confirmExecutableOpen(const QFileInfo &file)
void Widget::onIconClick(QSystemTrayIcon::ActivationReason reason) void Widget::onIconClick(QSystemTrayIcon::ActivationReason reason)
{ {
switch (reason) if (reason == QSystemTrayIcon::Trigger)
{ {
case QSystemTrayIcon::Trigger: if (isHidden() || isMinimized())
{ {
if (isHidden())
{
show();
activateWindow();
if (wasMaximized) if (wasMaximized)
showMaximized(); showMaximized();
else else
showNormal(); showNormal();
}
else if (isMinimized())
{
forceShow();
activateWindow();
if (wasMaximized)
showMaximized();
else
showNormal();
}
else
{
wasMaximized = isMaximized();
if (Settings::getInstance().getMinimizeToTray())
hide();
else
showMinimized();
}
break; activateWindow();
}
else if (!isActiveWindow())
{
activateWindow();
} }
case QSystemTrayIcon::MiddleClick:
wasMaximized = isMaximized();
if (Settings::getInstance().getMinimizeToTray())
hide();
else else
showMinimized(); {
break; wasMaximized = isMaximized();
case QSystemTrayIcon::Unknown: hide();
}
}
else if (reason == QSystemTrayIcon::Unknown)
{
if (isHidden()) if (isHidden())
forceShow(); forceShow();
break;
default:
break;
} }
} }