Improved tray icons for 175%+ scales

Author: ArtemAvramenko

CopyCopyDict.csproj

@@ -44,16 +44,6 @@
     <Compile Include="KeyModifiers.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Resources\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <None Include="LICENSE" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -70,7 +60,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\Icon.ico" />
+    <EmbeddedResource Include="Resources\Icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Program.cs

@@ -37,26 +37,9 @@ public static void Main()
                 menu.Items.Add("-");
                 menu.Items.Add("Exit", null, (e, a) => Application.Exit());
 
-                var icon = Resources.Resources.Icon;
-                using (var g = Graphics.FromHwnd(IntPtr.Zero))
-                {
-                    var desktop = g.GetHdc();
-                    var logicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES);
-                    var physicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES);
-                    var dpiY = GetDeviceCaps(desktop, (int)DeviceCap.LOGPIXELSY);
-                    var scale = Math.Max(
-                        (double)physicalScreenHeight / logicalScreenHeight,
-                        (double)dpiY / 96);
-                    var iconSize = (int)Math.Round(16 * scale);
-                    if (Array.IndexOf(new[] { 16, 20, 24 }, iconSize) >= 0)
-                    {
-                        icon = new Icon(icon, iconSize, iconSize);
-                    }
-                }
-
                 var trayIcon = new NotifyIcon
                 {
-                    Icon = icon,
+                    Icon = GetTrayIcon(),
                     ContextMenuStrip = menu,
                     Visible = true
                 };
@@ -100,6 +83,37 @@ private static void BrowseClipboardText()
             Browse(text);
         }
 
+        private static Icon GetTrayIcon()
+        {
+            using (var g = Graphics.FromHwnd(IntPtr.Zero))
+            {
+                var desktop = g.GetHdc();
+                var logicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES);
+                var physicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES);
+                var dpiY = GetDeviceCaps(desktop, (int)DeviceCap.LOGPIXELSY);
+                var scale = Math.Max(
+                    (double)physicalScreenHeight / logicalScreenHeight,
+                    (double)dpiY / 96);
+                var iconSize = (int)Math.Round(16 * scale);
+                var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+                var iconStream = assembly.GetManifestResourceStream("CopyCopyDict.Resources.Icon.ico");
+                if (Array.IndexOf(new[] { 16, 20, 24 }, iconSize) < 0)
+                {
+                    try
+                    {
+                        var bitmap = new Bitmap(iconStream);
+                        return Icon.FromHandle(bitmap.GetHicon());
+                    }
+                    catch
+                    {
+                    }
+
+                }
+                iconStream.Position = 0;
+                return new Icon(iconStream, iconSize, iconSize);
+            }
+        }
+
         [DllImport("gdi32.dll")]
         static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
         public enum DeviceCap

Properties/AssemblyInfo.cs

@@ -31,5 +31,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.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]