Taskbar Color should be considered for the taskbar icon #1

DerKnob · Nov 4, 2020 · dc20fc3 · dc20fc3
1 parent 348b023
commit dc20fc3
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 7 deletions.
diff --git a/BlinkStickBusylightClient/BlinkStickBusylightClient.csproj b/BlinkStickBusylightClient/BlinkStickBusylightClient.csproj
@@ -152,5 +152,8 @@
     <Resource Include="Resources\favicon.ico" />
     <Resource Include="Resources\trayicon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\trayiconBlack.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/BlinkStickBusylightClient/NotifyIcon.cs b/BlinkStickBusylightClient/NotifyIcon.cs
@@ -14,7 +14,14 @@ class NotifyIcon
         public NotifyIcon()
         {
             notifyIcon = new System.Windows.Forms.NotifyIcon();
-            notifyIcon.Icon = Properties.Resources.trayicon;
+
+            // what tryicon should be used?
+            bool systemUsesLightTheme = WPF.ColorManager.SystemUsesLightTheme();
+            if (systemUsesLightTheme)
+                notifyIcon.Icon = Properties.Resources.trayiconBlack;
+            else
+                notifyIcon.Icon = Properties.Resources.trayicon;
+
             notifyIcon.Visible = true;
             notifyIcon.DoubleClick += new EventHandler(notifyIconDoubleClick);
 

diff --git a/BlinkStickBusylightClient/Properties/AssemblyInfo.cs b/BlinkStickBusylightClient/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.1")]
-[assembly: AssemblyFileVersion("1.0.1.1")]
+[assembly: AssemblyVersion("1.0.2.1")]
+[assembly: AssemblyFileVersion("1.0.2.1")]
diff --git a/BlinkStickBusylightClient/Properties/Resources.Designer.cs b/BlinkStickBusylightClient/Properties/Resources.Designer.cs
diff --git a/BlinkStickBusylightClient/Properties/Resources.resx b/BlinkStickBusylightClient/Properties/Resources.resx
@@ -121,4 +121,7 @@
   <data name="trayicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trayicon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="trayiconBlack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trayiconBlack.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/BlinkStickBusylightClient/Resources/trayiconBlack.ico b/BlinkStickBusylightClient/Resources/trayiconBlack.ico
diff --git a/BlinkStickBusylightClient/WPF/ColorManager.cs b/BlinkStickBusylightClient/WPF/ColorManager.cs
@@ -23,6 +23,22 @@ public static Color PrimaryTextColor
             get { return GetPrimaryTextColor(); }
         }
 
+        public static bool SystemUsesLightTheme()
+        {
+            bool isLightMode = true;
+            try
+            {
+                var v = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "SystemUsesLightTheme", "1");
+                if (v != null && v.ToString() == "0")
+                    isLightMode = false;
+            }
+            catch
+            {
+            }
+
+            return isLightMode;
+        }
+
         private static Color GetAccentColor()
         {
             if (EnvironmentUtils.IsWindowsVersion8OrHigher())

diff --git a/BlinkStickBusylightClient/packages.config b/BlinkStickBusylightClient/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BlinkStickDotNet" version="2.0.16" targetFramework="net461" />
-  <package id="Extended.Wpf.Toolkit" version="3.3.0" targetFramework="net461" />
-  <package id="HidSharp" version="1.5" targetFramework="net461" />
-  <package id="LibUsbDotNet" version="2.2.8" targetFramework="net461" />
+  <package id="BlinkStickDotNet" version="2.0.16" targetFramework="net46" />
+  <package id="Extended.Wpf.Toolkit" version="3.3.0" targetFramework="net46" />
+  <package id="HidSharp" version="1.5" targetFramework="net46" />
+  <package id="LibUsbDotNet" version="2.2.8" targetFramework="net46" />
 </packages>