test/HandyControl
1
0
Fork 0
mirror of https://gitee.com/handyorg/HandyControl.git synced 2024-11-30 02:48:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update PushMainWindow2TopCommand

Browse Source
This commit is contained in:
NaBian 2020-08-28 00:00:50 +08:00
parent 7151fec7b8
commit 652bdf918e
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
View File

@ -1,8 +1,7 @@
using System;
using System.Windows;
using System.Windows.Input;
using System.Windows.Interop;
using HandyControl.Tools.Interop;
using HandyControl.Tools;
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);
if (hwndSource != null)
{
InteropMethods.SetForegroundWindow(hwndSource.Handle);
}
WindowHelper.SetWindowToForeground(Application.Current.MainWindow);
}
}

6
src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
View File

@ -157,15 +157,13 @@ namespace HandyControl.Tools
/// 让窗口激活作为前台最上层窗口
/// </summary>
/// <param name="window"></param>
public static void SetWindowToForegroundWithAttachThreadInput(Window window)
public static void SetWindowToForeground(Window window)
{
// [WPF 让窗口激活作为前台最上层窗口的方法 - lindexi - 博客园](https://www.cnblogs.com/lindexi/p/12749671.html)
var interopHelper = new WindowInteropHelper(window);
// 以下 Win32 方法可以在 https://github.com/kkwpsv/lsjutil/tree/master/Src/Lsj.Util.Win32 找到
var thisWindowThreadId = InteropMethods.GetWindowThreadProcessId(interopHelper.Handle, out _);
var currentForegroundWindow = InteropMethods.GetForegroundWindow();
var currentForegroundWindowThreadId =
InteropMethods.GetWindowThreadProcessId(currentForegroundWindow, out _);
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 )