From 81f6e6959a242c52b036900457c8c11cf81a62f1 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 8 Apr 2019 22:03:00 +0800
Subject: [PATCH 1/2] update pr/64
---
.../HandyControlDemo_Net_GE45.csproj | 4 ++--
.../HandyControl_Net_GE45.csproj | 4 ++--
.../Tools/Interop/NativeValues.cs | 19 -------------------
.../Tools/Interop/UnsafeNativeMethods.cs | 4 ----
4 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 5aead87b..6316de29 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -36,7 +36,7 @@
DEBUG;TRACE
prompt
4
- v4.7.2
+ v4.7
AnyCPU
@@ -56,7 +56,7 @@
TRACE
prompt
4
- v4.7.2
+ v4.7
..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 52fee2f9..eaebb56e 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -33,7 +33,7 @@
DEBUG;TRACE
prompt
4
- v4.7.2
+ v4.7
netgt40
@@ -66,7 +66,7 @@
prompt
4
bin\Release\HandyControl.xml
- v4.7.2
+ v4.7
netgt40
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
index 67796c7a..2aef2758 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
@@ -1,7 +1,5 @@
// ReSharper disable InconsistentNaming
-using System.Runtime.InteropServices;
-
namespace HandyControl.Tools.Interop
{
internal enum SM
@@ -99,21 +97,4 @@ namespace HandyControl.Tools.Interop
internal const int TRUE = 1;
internal const int FALSE = 0;
}
-
- [StructLayout(LayoutKind.Sequential)]
- public class POINT
- {
- public int x;
- public int y;
-
- public POINT()
- {
- }
-
- public POINT(int x, int y)
- {
- this.x = x;
- this.y = y;
- }
- }
}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
index f4ff08dd..a88f2d1b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
@@ -2,7 +2,6 @@
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
using System.Security;
using System.Text;
@@ -173,9 +172,6 @@ namespace HandyControl.Tools.Interop
[DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
public static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
- [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
- public static extern bool GetCursorPos([In, Out] POINT pt);
-
[DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
public static extern bool SetForegroundWindow(IntPtr hWnd);
}
From 7bb9d0ad6f165874105ff8870c0c9d2e48f8fa87 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 8 Apr 2019 22:36:02 +0800
Subject: [PATCH 2/2] Update NotifyIcon.cs
---
src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index db2715bc..badb1c40 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -331,7 +331,9 @@ namespace HandyControl.Controls
{
Placement = PlacementMode.Mouse,
AllowsTransparency = true,
- StaysOpen = false
+ StaysOpen = false,
+ UseLayoutRounding = true,
+ SnapsToDevicePixels = true
};
}