From 15be0063257dc85eadecbe76944b501e75267e8b Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 2 Sep 2024 18:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8C=89=E9=94=AE=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=B7=A5=E5=85=B7=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=9C=80?=
 =?UTF-8?q?=E5=B0=8F=E5=8C=96=E5=90=8E=E6=89=AB=E6=8F=8F=EF=BC=8C=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?BUG=201261?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/mainwindow.cpp | 21 +++++++++++++++++++++
 app/scantool/mainwindow.h   |  1 +
 2 files changed, 22 insertions(+)

diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index cebbc133..592baaaf 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -1266,6 +1266,27 @@ void MainWindow::timerEvent(QTimerEvent *e)
     }
 }
 
+void MainWindow::changeEvent(QEvent *e)
+{
+    if (QEvent::WindowStateChange == e->type())
+    {
+        QWindowStateChangeEvent *event = dynamic_cast<QWindowStateChangeEvent*>(e);
+        if (nullptr != event)
+        {
+            if (this->isMinimized())
+            {
+                if (m_dlgScanInfo->isVisible())
+                {
+                    m_dlgScanInfo->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+                    m_dlgScanInfo->show();
+                    m_dlgScanInfo->activateWindow();
+                    m_dlgScanInfo->raise();
+                }
+            }
+        }
+    }
+}
+
 void MainWindow::on_deviceArrive(QString devName)
 {
     if (devName.contains("306") || devName.contains("307") || devName.contains("358") || devName.contains("9225"))
diff --git a/app/scantool/mainwindow.h b/app/scantool/mainwindow.h
index 773f10f5..a2e9dfd4 100644
--- a/app/scantool/mainwindow.h
+++ b/app/scantool/mainwindow.h
@@ -50,6 +50,7 @@ private:
 protected:
     virtual void closeEvent(QCloseEvent *e) override;
     virtual void timerEvent(QTimerEvent* e) override;
+    virtual void changeEvent(QEvent* e) override;
 
 signals:
     void deviceArrive(QString devName);