Browse Source

win32 - fix activate method, now same as wpf.

pull/6560/head
Dan Walmsley 5 years ago
parent
commit
52e188507c
  1. 3
      src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
  2. 2
      src/Windows/Avalonia.Win32/WindowImpl.cs

3
src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs

@ -1110,6 +1110,9 @@ namespace Avalonia.Win32.Interop
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true)]
public static extern IntPtr SetActiveWindow(IntPtr hWnd); public static extern IntPtr SetActiveWindow(IntPtr hWnd);
[DllImport("user32.dll", SetLastError = true)]
public static extern bool SetForegroundWindow(IntPtr hWnd);
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern IntPtr SetCapture(IntPtr hWnd); public static extern IntPtr SetCapture(IntPtr hWnd);

2
src/Windows/Avalonia.Win32/WindowImpl.cs

@ -507,7 +507,7 @@ namespace Avalonia.Win32
public void Activate() public void Activate()
{ {
SetActiveWindow(_hwnd); SetForegroundWindow(_hwnd);
} }
public IPopupImpl CreatePopup() => Win32Platform.UseOverlayPopups ? null : new PopupImpl(this); public IPopupImpl CreatePopup() => Win32Platform.UseOverlayPopups ? null : new PopupImpl(this);

Loading…
Cancel
Save