add trayicon baseon notifyicon

Author: chancezheng

.editorconfig

@@ -41,3 +41,12 @@ dotnet_diagnostic.CS8632.severity = none
 
 # CS8604: 可能的 null 引用参数。
 dotnet_diagnostic.CS8604.severity = none
+
+# CS3003: 类型不符合 CLS
+dotnet_diagnostic.CS3003.severity = none
+
+# CS3009: 基类型不符合 CLS
+dotnet_diagnostic.CS3009.severity = none
+
+# CS3001: 参数类型不符合 CLS
+dotnet_diagnostic.CS3001.severity = none

CookPopularCSharpToolkit/Communal/Extensions/ImageBitmapExtension.cs

@@ -8,6 +8,7 @@
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Resources;
 
 
 
@@ -74,6 +75,23 @@ public static Icon ToIcon(this Bitmap bitmap, System.Drawing.Size size)
             }
         }
 
+        public static Icon ToIcon(this ImageSource imageSource)
+        {
+            if (imageSource == null) return null;
+
+            Uri uri = new Uri(imageSource.ToString());
+            StreamResourceInfo streamInfo = Application.GetResourceStream(uri);
+
+            if (streamInfo == null)
+            {
+                string msg = "The supplied image source '{0}' could not be resolved.";
+                msg = string.Format(msg, imageSource);
+                throw new ArgumentException(msg);
+            }
+
+            return new Icon(streamInfo.Stream);
+        }
+
         /// <summary>
         /// 转换Image为Icon
         /// </summary>

CookPopularCSharpToolkit/Windows/Extensions/WindowExtension.cs

@@ -134,8 +134,8 @@ internal struct FLASHWINFO
             [DllImport("user32.dll", SetLastError = true)]
             internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
 
-            [DllImport("user32.dll")]
-            internal static extern bool SetForegroundWindow(IntPtr hWnd);
+            //[DllImport("user32.dll")]
+            //internal static extern bool SetForegroundWindow(IntPtr hWnd);
 
             [DllImport("user32.dll", SetLastError = true)]
             internal static extern void SwitchToThisWindow(IntPtr hWnd, bool fAltTab);
@@ -237,7 +237,7 @@ public static bool SafeActivate(this Window window)
         {
             try
             {
-                return NativeMethods.SetForegroundWindow(window.EnsureHandle());
+                return InteropMethods.SetForegroundWindow(window.EnsureHandle());
             }
             catch (Exception)
             {

CookPopularCSharpToolkit/Windows/Helpers/RoutedEventHelper.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Windows;
+
+namespace CookPopularCSharpToolkit.Windows
+{
+    /// <summary>
+    /// Helper class used by routed events of the
+    /// <see cref="TaskbarIcon"/> class.
+    /// </summary>
+    public static class RoutedEventHelper
+    {
+        /// <summary>
+        /// A static helper method to raise a routed event on a target UIElement or ContentElement.
+        /// </summary>
+        /// <param name="target">UIElement or ContentElement on which to raise the event</param>
+        /// <param name="args">RoutedEventArgs to use when raising the event</param>
+        internal static void RaiseEvent(DependencyObject target, RoutedEventArgs args)
+        {
+            if (target is UIElement uiElement)
+            {
+                uiElement.RaiseEvent(args);
+            }
+            else if (target is ContentElement contentElement)
+            {
+                contentElement.RaiseEvent(args);
+            }
+        }
+
+        /// <summary>
+        /// A static helper method that adds a handler for a routed event 
+        /// to a target UIElement or ContentElement.
+        /// </summary>
+        /// <param name="element">UIElement or ContentElement that listens to the event</param>
+        /// <param name="routedEvent">Event that will be handled</param>
+        /// <param name="handler">Event handler to be added</param>
+        internal static void AddHandler(DependencyObject element, RoutedEvent routedEvent, Delegate handler)
+        {
+            if (element is UIElement uie)
+            {
+                uie.AddHandler(routedEvent, handler);
+            }
+            else if (element is ContentElement ce)
+            {
+                ce.AddHandler(routedEvent, handler);
+            }
+        }
+
+        /// <summary>
+        /// A static helper method that removes a handler for a routed event 
+        /// from a target UIElement or ContentElement.
+        /// </summary>
+        /// <param name="element">UIElement or ContentElement that listens to the event</param>
+        /// <param name="routedEvent">Event that will no longer be handled</param>
+        /// <param name="handler">Event handler to be removed</param>
+        internal static void RemoveHandler(DependencyObject element, RoutedEvent routedEvent, Delegate handler)
+        {
+            if (element is UIElement uie)
+            {
+                uie.RemoveHandler(routedEvent, handler);
+            }
+            else if (element is ContentElement ce)
+            {
+                ce.RemoveHandler(routedEvent, handler);
+            }
+        }
+    }
+}

CookPopularCSharpToolkit/Windows/Interop/InteropMethods.cs

@@ -21,9 +21,9 @@ internal class InteropMethods
 
         internal static readonly IntPtr HRGN_NONE = new IntPtr(-1);
 
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        [DllImport(InteropValues.ExternDll.User32, EntryPoint = "RegisterWindowMessageW", CharSet = CharSet.Auto)]
         [ResourceExposure(ResourceScope.None)]
-        internal static extern int RegisterWindowMessage(string msg);
+        internal static extern uint RegisterWindowMessage([MarshalAs(UnmanagedType.LPWStr)] string msg);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
         internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
@@ -170,6 +170,9 @@ internal static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.B
         [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
         internal static extern bool IntCloseHandle(HandleRef handle);
 
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern int GetDoubleClickTime();
+
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
@@ -234,11 +237,13 @@ internal static string GetModuleFileName(HandleRef hModule)
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto, BestFitMapping = false, ThrowOnUnmappableChar = true)]
-        internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge,
-            out IconHandle phiconSmall, int nIcons);
+        internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge, out IconHandle phiconSmall, int nIcons);
 
         [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto)]
-        internal static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
+        internal static extern bool Shell_NotifyIcon(int message, [In] ref InteropValues.NOTIFYICONDATA pnid);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        internal static extern bool GetPhysicalCursorPos(ref InteropValues.POINT lpPoint);
 
         [SecurityCritical]
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
@@ -263,7 +268,7 @@ internal static extern IntPtr CreateWindowEx(
         internal static extern short RegisterClass(InteropValues.WNDCLASS4ICON wc);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        internal static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        internal static extern IntPtr DefWindowProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
 
         [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
         internal static extern bool SetForegroundWindow(IntPtr hWnd);

CookPopularCSharpToolkit/Windows/Interop/NativeMethods.cs

@@ -56,8 +56,8 @@ internal struct RECT
 
         internal const int WS_EX_NOACTIVATE = 0x08000000;
 
-        [DllImport("user32.dll", SetLastError = true)]
-        internal static extern bool DestroyWindow(IntPtr hWnd);
+        //[DllImport("user32.dll", SetLastError = true)]
+        //internal static extern bool DestroyWindow(IntPtr hWnd);
 
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern uint GetWindowLong(IntPtr hWnd, int nIndex);
@@ -84,8 +84,8 @@ internal struct RECT
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern IntPtr GetForegroundWindow();
 
-        [DllImport("user32.dll", SetLastError = true)]
-        internal static extern bool SetForegroundWindow(IntPtr hWnd);
+        //[DllImport("user32.dll", SetLastError = true)]
+        //internal static extern bool SetForegroundWindow(IntPtr hWnd);
 
         [DllImport("User32")]
         internal static extern IntPtr GetTopWindow(IntPtr hWnd);