diff --git a/.gitignore b/.gitignore index f5e0eb7f..d2b39f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,7 @@ src/Net_GE45/HandyControl_Net_GE45/obj src/Net_GE45/HandyControlDemo_Net_GE45/bin src/Net_GE45/HandyControlDemo_Net_GE45/obj *.user +/.vs/HandyControl/v16/.suo +/.vs/ProjectSettings.json +/.vs/VSWorkspaceState.json +/.vs/slnx.sqlite 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 6316de29..5aead87b 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 + v4.7.2 AnyCPU @@ -56,7 +56,7 @@ TRACE prompt 4 - v4.7 + v4.7.2 ..\..\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 eaebb56e..52fee2f9 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 + v4.7.2 netgt40 @@ -66,7 +66,7 @@ prompt 4 bin\Release\HandyControl.xml - v4.7 + v4.7.2 netgt40 diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs index fa1598a5..db2715bc 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs @@ -322,8 +322,6 @@ namespace HandyControl.Controls private void ShowContextMenu() { - var point = new POINT(); - UnsafeNativeMethods.GetCursorPos(point); if (ContextContent != null) { @@ -331,14 +329,12 @@ namespace HandyControl.Controls { _contextContent = new Popup { - Placement = PlacementMode.AbsolutePoint, + Placement = PlacementMode.Mouse, AllowsTransparency = true, StaysOpen = false }; } - _contextContent.HorizontalOffset = point.x; - _contextContent.VerticalOffset = point.y; _contextContent.Child = new ContentControl { Content = ContextContent @@ -354,9 +350,7 @@ namespace HandyControl.Controls } else if (ContextMenu != null) { - ContextMenu.Placement = PlacementMode.AbsolutePoint; - ContextMenu.HorizontalOffset = point.x; - ContextMenu.VerticalOffset = point.y; + ContextMenu.Placement = PlacementMode.Mouse; ContextMenu.IsOpen = true; var handle = IntPtr.Zero;