Merge pull request #14 from narozeol/work

修复了关闭到托盘后使用alt+tap仍然能看见任务的bug
NaroZeol · Oct 24, 2023 · 72733ab · 72733ab
2 parents 4675fa9 + 1f90d83
commit 72733ab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/Program/Normal.ico b/Program/Normal.ico
diff --git a/Program/Program.csproj b/Program/Program.csproj
@@ -6,8 +6,13 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
+    <ApplicationIcon>Normal.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="Normal.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
   </ItemGroup>

diff --git a/Program/src/Extensions/AppendTextExtension.cs b/Program/src/Extensions/AppendTextExtension.cs
@@ -1,4 +1,6 @@
-namespace MainFunction;
+using System.Runtime.InteropServices;
+
+namespace MainFunction;
 static class AppendTextExtension
 {
     public static void AppendTextColorful(this RichTextBox rtBox, string addtext, Color color, int addNewLine = 1)

diff --git a/Program/src/UI/Form1.cs b/Program/src/UI/Form1.cs
@@ -5,7 +5,7 @@
 namespace WinFormsApp1
 {
     public partial class Form1 : Form
-    {
+    {   
         public Form1()
         {
             InitializeComponent();
@@ -123,11 +123,13 @@ private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
             e.Cancel = true;
 
-            this.WindowState = FormWindowState.Minimized;
+            this.Hide();
 
-            this.ShowInTaskbar = false;
+            //this.WindowState = FormWindowState.Minimized;
 
-            NoticeIcon.Visible = true;
+            //this.ShowInTaskbar = false;
+
+            //NoticeIcon.Visible = true;
         }
 
         private void NoticeIcon_MouseClick(object sender, MouseEventArgs e)
@@ -138,6 +140,7 @@ private void NoticeIcon_MouseClick(object sender, MouseEventArgs e)
             }
             else
             {
+                this.Show();
                 this.WindowState = FormWindowState.Normal;
                 this.ShowInTaskbar = true;
             }