Merge branch 'develop'

hardcodet · Oct 16, 2024 · 17859d2 · 17859d2
2 parents 9737877 + 50faac1
commit 17859d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/Changelog.txt b/src/Changelog.txt
@@ -2,6 +2,12 @@ hardcodet.net NotifyIcon for WPF - Changelog
 Copyright (c) 2009-2021 Philipp Sumi
 Contact and Information: http://www.hardcodet.net
 
+2.0.1 (2024.10.16)
+*****
+
+FIX   Fix double execution of LeftClickCommand
+FIX   Fix context menu position acording to dpi setting
+
 2.0.0 (2024.07.10)
 *****
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,7 @@
     <DebugSymbols>True</DebugSymbols>
     <DebugType>embedded</DebugType>
 
-    <Copyright>Copyright (c) 2009-2022 Philipp Sumi</Copyright>
+    <Copyright>Copyright (c) 2009 - 2019 Philipp Sumi, 2019 - $([System.DateTime]::Today.ToString(yyyy)) Philipp Sumi, Robin Krom, Jan Karger</Copyright>
     <Company>hardcodet.net</Company>
     <Authors>Philipp Sumi, Robin Krom, Jan Karger</Authors>
     <PackageIcon>icon.png</PackageIcon>
@@ -34,7 +34,7 @@ Source code and extensive sample application available at http://www.hardcodet.n
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -56,7 +56,10 @@ Source code and extensive sample application available at http://www.hardcodet.n
       </PropertyGroup>
 
       <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
         <None Include="$(SolutionDir)\icon.png" Pack="true" PackagePath="\"/>
       </ItemGroup>
 

diff --git a/src/NotifyIconWpf/Interop/WindowMessageSink.cs b/src/NotifyIconWpf/Interop/WindowMessageSink.cs
@@ -240,7 +240,7 @@ private void ProcessWindowMessage(uint msg, IntPtr wParam, IntPtr lParam)
                     {
                         X = (short)((nint)wParam & 0xFFFF),
                         Y = (short)((nint)wParam >> 16 & 0xFFFF)
-                    });
+                    }.ScaleWithDpi());
                     break;
 
                 case WindowsMessages.WM_MOUSEMOVE:
@@ -251,9 +251,9 @@ private void ProcessWindowMessage(uint msg, IntPtr wParam, IntPtr lParam)
                     MouseEventReceived?.Invoke(MouseEvent.IconLeftMouseDown);
                     break;
 
-                case WindowsMessages.NIN_SELECT:
-                    //Sent when the icon is selected with the left mouse button.
-                case WindowsMessages.WM_LBUTTONUP:
+                case WindowsMessages.NIN_SELECT when Version == NotifyIconVersion.Vista:
+                    // Sent when the icon is selected with the left mouse button.
+                case WindowsMessages.WM_LBUTTONUP when Version != NotifyIconVersion.Vista:
                     if (!isDoubleClick)
                     {
                         MouseEventReceived?.Invoke(MouseEvent.IconLeftMouseUp);

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.403",
     "rollForward": "feature",
     "allowPrerelease": false
   }