mirror of
https://github.com/QL-Win/QuickLook.git
synced 2025-12-12 01:08:02 +08:00
Fix #644 step 1: correctly bring window back to top when clicked
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
using System;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Interop;
|
||||
using System.Windows.Media.Animation;
|
||||
using QuickLook.Common.ExtensionMethods;
|
||||
using QuickLook.Common.Helpers;
|
||||
@@ -55,16 +56,15 @@ namespace QuickLook
|
||||
|
||||
StateChanged += (sender, e) => _ignoreNextWindowSizeChange = true;
|
||||
|
||||
// bring the window to top when users click in the client area.
|
||||
// the non-client area is handled by the WndProc inside OnSourceInitialized().
|
||||
PreviewMouseDown += (sender, e) => this.BringToFront(false);
|
||||
|
||||
windowFrameContainer.PreviewMouseMove += ShowWindowCaptionContainer;
|
||||
|
||||
Topmost = SettingHelper.Get("Topmost", false);
|
||||
buttonTop.Tag = Topmost ? "Top" : "Auto";
|
||||
|
||||
SourceInitialized += (sender, e) => this.SetNoactivate();
|
||||
|
||||
// bring the window to top. use together with SetNoactivate()
|
||||
PreviewMouseDown += (sender, e) => this.BringToFront(false);
|
||||
|
||||
buttonTop.Click += (sender, e) =>
|
||||
{
|
||||
Topmost = !Topmost;
|
||||
@@ -103,6 +103,27 @@ namespace QuickLook
|
||||
buttonOpenWith.Click += (sender, e) => ShareHelper.Share(_path, this, true);
|
||||
}
|
||||
|
||||
// bring the window to top when users click in the non-client area.
|
||||
protected override void OnSourceInitialized(EventArgs e)
|
||||
{
|
||||
base.OnSourceInitialized(e);
|
||||
|
||||
this.SetNoactivate();
|
||||
|
||||
HwndSource.FromHwnd(new WindowInteropHelper(this).Handle)?.AddHook(
|
||||
(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
|
||||
{
|
||||
switch (msg)
|
||||
{
|
||||
case 0x0112: // WM_SYSCOMMAND
|
||||
this.BringToFront(false);
|
||||
break;
|
||||
}
|
||||
|
||||
return IntPtr.Zero;
|
||||
});
|
||||
}
|
||||
|
||||
public override void OnApplyTemplate()
|
||||
{
|
||||
base.OnApplyTemplate();
|
||||
|
||||
Reference in New Issue
Block a user