From 3a3369150d3745102b7f8cac2846c5a67f0c59a2 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Thu, 9 May 2024 13:35:54 +0800
Subject: [PATCH] =?UTF-8?q?scantool=E6=89=AB=E6=8F=8F=E6=97=B6=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=BC=B9=E5=87=BA=E6=8C=89=E9=94=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/mainwindow.cpp | 20 +++++++++++++++-----
 app/scantool/mainwindow.h   |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index 4abb9d1b..3b320947 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -629,7 +629,9 @@ void MainWindow::StartScan(unsigned int buttonId)
 
     if (!find)
     {
-        // 手动扫描一定能找到配置，按键扫描不能提示
+        // 手动扫描一定能找到配置，按键扫描需要弹出设置对话框
+        Show();
+        on_pushButtonAdd_clicked();
         return;
     }
 
@@ -1039,6 +1041,16 @@ void MainWindow::SaveImage(HGImage image)
     }
 }
 
+void MainWindow::Show()
+{
+    show();
+    if (isMaximized())
+        showMaximized();
+    else
+        showNormal();
+    raise();
+}
+
 int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param)
 {
     (void)hdev;
@@ -1310,8 +1322,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
     }
     else if (QSystemTrayIcon::DoubleClick == reason)
     {
-        show();
-        raise();
+        Show();
     }
     else if (QSystemTrayIcon::MiddleClick == reason)
     {
@@ -1321,8 +1332,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
 
 void MainWindow::on_showMainWindowDlg()
 {
-    show();
-    raise();
+    Show();
 }
 
 void MainWindow::on_pushButtonAdd_clicked()
diff --git a/app/scantool/mainwindow.h b/app/scantool/mainwindow.h
index 99915021..2db32f81 100644
--- a/app/scantool/mainwindow.h
+++ b/app/scantool/mainwindow.h
@@ -41,6 +41,7 @@ private:
     void StartScan(unsigned int buttonId);
     void AddManualScanParam();
     void SaveImage(HGImage image);
+    void Show();
     static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param);
     static void HGAPI ocrThreadFunc(HGThread thread, HGPointer param);
     static void HGAPI ocrMsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointer param);