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 'pr1392'

Browse Source
This commit is contained in:
Dubslow 2015-03-16 17:35:21 -05:00
commit fc720f570d
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widget/widget.cpp
View File

@ -433,23 +433,29 @@ void Widget::onIconClick(QSystemTrayIcon::ActivationReason reason)
{ {
show(); show();
activateWindow(); activateWindow();
showNormal();
} }
else if (isMinimized()) else if (isMinimized())
{ {
forceShow(); forceShow();
activateWindow();
showNormal();
} }
else else
{ {
if (Settings::getInstance().getMinimizeToTray())
hide(); hide();
else
showMinimized();
} }
break; break;
} }
case QSystemTrayIcon::DoubleClick:
forceShow();
break;
case QSystemTrayIcon::MiddleClick: case QSystemTrayIcon::MiddleClick:
if (Settings::getInstance().getMinimizeToTray())
hide(); hide();
else
showMinimized();
break; break;
case QSystemTrayIcon::Unknown: case QSystemTrayIcon::Unknown:
if (isHidden()) if (isHidden())