更新内容

tool/livetool/trayicon.cpp

@@ -35,7 +35,7 @@ void TrayIcon::iconIsActived(QSystemTrayIcon::ActivationReason reason)
     switch (reason) {
         case QSystemTrayIcon::Trigger:
         case QSystemTrayIcon::DoubleClick: {
-            mainWidget->showNormal();
+            this->showMainWidget();
             break;
         }
 
@@ -59,7 +59,7 @@ void TrayIcon::setExitDirect(bool exitDirect)
 void TrayIcon::setMainWidget(QWidget *mainWidget)
 {
     this->mainWidget = mainWidget;
-    menu->addAction("主界面", mainWidget, SLOT(showNormal()));
+    menu->addAction("主界面", this, SLOT(showMainWidget()));
 
     if (exitDirect) {
         menu->addAction("退出", this, SLOT(closeAll()));
@@ -70,6 +70,14 @@ void TrayIcon::setMainWidget(QWidget *mainWidget)
     trayIcon->setContextMenu(menu);
 }
 
+void TrayIcon::showMainWidget()
+{
+    if (mainWidget) {
+        mainWidget->showNormal();
+        mainWidget->activateWindow();
+    }
+}
+
 void TrayIcon::showMessage(const QString &title, const QString &msg, QSystemTrayIcon::MessageIcon icon, int msecs)
 {
     trayIcon->showMessage(title, msg, icon, msecs);