Always launch Thunderbird minimised if this application is the one la…

…unching.
TheGuardianWolf · Feb 16, 2020 · 7f47ca5 · 7f47ca5
1 parent 4e92644
commit 7f47ca5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/lib/Properties/AssemblyInfo.cs b/lib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.4.0")]
-[assembly: AssemblyFileVersion("1.3.4.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/lib/TrayBird.cs b/lib/TrayBird.cs
@@ -32,6 +32,8 @@ public partial class TrayBird : ApplicationContext
         private bool thunderbirdShown = true;
         private WindowVisualState lastVisualState = WindowVisualState.Minimized;
         private AutomationElement thunderbirdAutomationElement;
+        private bool trayLaunched = false; // Was Thunderbird last launched with TrayBird?
+
         private User32.ShowWindowType restoreState
         {
             get
@@ -200,6 +202,7 @@ public void StartThunderbird()
             )
             {
                 log.Information("Starting Thunderbird...");
+                trayLaunched = true;
                 process.Start();
             }
         }
@@ -282,7 +285,15 @@ private bool HookThunderbird()
 
             // If not already hidden and is currently minimised, hide immediately
             var isIconic = User32.IsIconic(thunderbirdMainWindowHandle);
-            if (thunderbirdShown && isIconic)
+
+            if (trayLaunched)
+            {
+                log.Information("Thunderbird launched with tray application, hiding now. {@thunderbirdShown}.", thunderbirdShown);
+                lastVisualState = (WindowVisualState)thunderbirdAutomationElement.GetCurrentPropertyValue(WindowPattern.WindowVisualStateProperty);
+                HideThunderbird();
+
+            }
+            if ((thunderbirdShown && isIconic) || trayLaunched)
             {
                 log.Information("Thunderbird is already minimised, hiding now. {@thunderbirdShown}, {@isIconic}.", thunderbirdShown, isIconic);
                 HideThunderbird();

diff --git a/netcore/ThunderbirdTray.NETCore.csproj b/netcore/ThunderbirdTray.NETCore.csproj
@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <Version>1.3.4</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>ThunderbirdTray</RootNamespace>
     <AssemblyName>ThunderbirdTray</AssemblyName>
   </PropertyGroup>

diff --git a/netframework/Properties/AssemblyInfo.cs b/netframework/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.4.0")]
-[assembly: AssemblyFileVersion("1.3.4.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]