Merge branch 'master' of https://github.com/HandyOrg/HandyControl

README-cn.md

@@ -75,6 +75,7 @@
 <a href="https://github.com/LostAsk" target="_blank"><img style="border-radius:50%!important" width="64px" alt="LostAsk" src="https://avatars0.githubusercontent.com/u/46678241?s=64&v=4"></a>
 <a href="https://github.com/sanshiliuxiao" target="_blank"><img style="border-radius:50%!important" width="64px" alt="sanshiliuxiao" src="https://avatars3.githubusercontent.com/u/25658690?s=64&v=4"></a>
 <a href="https://github.com/QJJMSK" target="_blank"><img style="border-radius:50%!important" width="64px" alt="QJJMSK" src="https://avatars2.githubusercontent.com/u/28100716?s=64&v=4"></a>
+<a href="https://github.com/dspcjy" target="_blank"><img style="border-radius:50%!important" width="64px" alt="dspcjy" src="https://avatars3.githubusercontent.com/u/17764711?s=64&v=4"></a>
 
 ## Special thanks to
 

README.md

@@ -75,6 +75,7 @@
 <a href="https://github.com/LostAsk" target="_blank"><img style="border-radius:50%!important" width="64px" alt="LostAsk" src="https://avatars0.githubusercontent.com/u/46678241?s=64&v=4"></a>
 <a href="https://github.com/sanshiliuxiao" target="_blank"><img style="border-radius:50%!important" width="64px" alt="sanshiliuxiao" src="https://avatars3.githubusercontent.com/u/25658690?s=64&v=4"></a>
 <a href="https://github.com/QJJMSK" target="_blank"><img style="border-radius:50%!important" width="64px" alt="QJJMSK" src="https://avatars2.githubusercontent.com/u/28100716?s=64&v=4"></a>
+<a href="https://github.com/dspcjy" target="_blank"><img style="border-radius:50%!important" width="64px" alt="dspcjy" src="https://avatars3.githubusercontent.com/u/17764711?s=64&v=4"></a>
 
 ## Special thanks to
 

src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs

@@ -359,6 +359,15 @@ namespace HandyControl.Controls
             }
         }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => VerifyData();
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            VerifyData();
+
+            if (!IsSafeEnabled && ShowPassword)
+            {
+                Password = _textBox.Text;
+                SetCurrentValue(UnsafePasswordProperty, Password);
+            }
+        }
     }
 }

src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interop;
+using HandyControl.Tools;
-using HandyControl.Tools.Interop;
 
 namespace HandyControl.Interactivity
 {
@@ -15,11 +14,7 @@ namespace HandyControl.Interactivity
             if (Application.Current.MainWindow != null && Application.Current.MainWindow.Visibility != Visibility.Visible)
             {
                 Application.Current.MainWindow.Show();
-                var hwndSource = (HwndSource)PresentationSource.FromDependencyObject(Application.Current.MainWindow);
+                WindowHelper.SetWindowToForeground(Application.Current.MainWindow);
-                if (hwndSource != null)
-                {
-                    InteropMethods.SetForegroundWindow(hwndSource.Handle);
-                }
             }
         }
 

src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs

@@ -152,5 +152,42 @@ namespace HandyControl.Tools
         public static IntPtr GetHandle(this Window window) => new WindowInteropHelper(window).EnsureHandle();
 
         public static HwndSource GetHwndSource(this Window window) => HwndSource.FromHwnd(window.GetHandle());
+
+        /// <summary>
+        /// 让窗口激活作为前台最上层窗口
+        /// </summary>
+        /// <param name="window"></param>
+        public static void SetWindowToForeground(Window window)
+        {
+            // [WPF 让窗口激活作为前台最上层窗口的方法 - lindexi - 博客园](https://www.cnblogs.com/lindexi/p/12749671.html)
+            var interopHelper = new WindowInteropHelper(window);
+            var thisWindowThreadId = InteropMethods.GetWindowThreadProcessId(interopHelper.Handle, out _);
+            var currentForegroundWindow = InteropMethods.GetForegroundWindow();
+            var currentForegroundWindowThreadId = InteropMethods.GetWindowThreadProcessId(currentForegroundWindow, out _);
+
+            // [c# - Bring a window to the front in WPF - Stack Overflow](https://stackoverflow.com/questions/257587/bring-a-window-to-the-front-in-wpf )
+            // [SetForegroundWindow的正确用法 - 子坞 - 博客园](https://www.cnblogs.com/ziwuge/archive/2012/01/06/2315342.html )
+            /*
+               　　1.得到窗口句柄FindWindow 
+            　　　　2.切换键盘输入焦点AttachThreadInput 
+            　　　　3.显示窗口ShowWindow(有些窗口被最小化/隐藏了) 
+            　　　　4.更改窗口的Z Order，SetWindowPos使之最上，为了不影响后续窗口的Z Order,改完之后，再还原 
+            　　　　5.最后SetForegroundWindow 
+             */
+
+            InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, true);
+
+            window.Show();
+            window.Activate();
+            // 去掉和其他线程的输入链接
+            InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, false);
+
+            // 用于踢掉其他的在上层的窗口
+            if (window.Topmost != true)
+            {
+                window.Topmost = true;
+                window.Topmost = false;
+            }
+        }
     }
 }

src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs

@@ -43,6 +43,13 @@ namespace HandyControl.Tools.Interop
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
         internal static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+        internal static extern bool AttachThreadInput(in uint currentForegroundWindowThreadId,
+            in uint thisWindowThreadId, bool isAttach);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+        internal static extern IntPtr GetForegroundWindow();
+
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
         internal static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
             [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);