解决窗口最小化时无法弹出的问题

NPCDW · Apr 23, 2022 · cf52608 · cf52608
1 parent 83c77b2
commit cf52608
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/WindowsFormsOCR/MainForm.cs b/WindowsFormsOCR/MainForm.cs
@@ -36,6 +36,7 @@ private void Setting_Click(object sender, EventArgs e)
             {
                 if (form is SettingForm)
                 {
+                    form.WindowState = FormWindowState.Normal;
                     form.Activate();
                     return;
                 }
@@ -89,6 +90,7 @@ private void Translate_HotKey_Click(object sender, EventArgs e)
                 if (item is TranslateAndOcrForm)
                 {
                     form = (TranslateAndOcrForm)item;
+                    form.WindowState = FormWindowState.Normal;
                     form.Activate();
                     break;
                 }
@@ -110,29 +112,13 @@ private void Translate_HotKey_Click(object sender, EventArgs e)
 
         private void ScreenshotTranslation_Click(object sender, EventArgs e)
         {
-            foreach (Form form in Application.OpenForms)
-            {
-                if (form is ScreenshotForm)
-                {
-                    form.Activate();
-                    return;
-                }
-            }
             ScreenshotForm body = new ScreenshotForm("translate");
             body.Size = Screen.PrimaryScreen.Bounds.Size;
             body.Show();
         }
 
         private void OcrButton_Click(object sender, EventArgs e)
         {
-            foreach (Form form in Application.OpenForms)
-            {
-                if (form is ScreenshotForm)
-                {
-                    form.Activate();
-                    return;
-                }
-            }
             ScreenshotForm body = new ScreenshotForm();
             body.Size = Screen.PrimaryScreen.Bounds.Size;
             body.Show();

diff --git a/WindowsFormsOCR/Properties/AssemblyInfo.cs b/WindowsFormsOCR/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1")]
-[assembly: AssemblyFileVersion("1.3.1")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]
diff --git a/WindowsFormsOCR/ScreenshotForm.cs b/WindowsFormsOCR/ScreenshotForm.cs
@@ -94,6 +94,7 @@ private void Screenshot_MouseUp(object sender, MouseEventArgs e)
                 if (item is TranslateAndOcrForm)
                 {
                     form = (TranslateAndOcrForm)item;
+                    form.WindowState = FormWindowState.Normal;
                     form.Activate();
                     break;
                 }

diff --git a/WindowsFormsOCR/SettingForm.Designer.cs b/WindowsFormsOCR/SettingForm.Designer.cs
diff --git a/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs b/WindowsFormsOCR/TranslateAndOCRForm.Designer.cs