Skip to content

Commit

Permalink
Revert "Fix #644: still use focusable window on Windows 7 and 8"
Browse files Browse the repository at this point in the history
This reverts commit 452574e.

Revert "Fix #644 step 1: correctly bring window back to top when clicked"

This reverts commit af608dc.
  • Loading branch information
xupefei committed May 21, 2020
1 parent f8416ba commit a7115f6
Showing 1 changed file with 4 additions and 35 deletions.
39 changes: 4 additions & 35 deletions QuickLook/ViewerWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
using System;
using System.Windows;
using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Animation;
using QuickLook.Common.ExtensionMethods;
using QuickLook.Common.Helpers;
using QuickLook.Common.Plugin;
using QuickLook.Helpers;
using Brush = System.Windows.Media.Brush;
using FontFamily = System.Windows.Media.FontFamily;
using Size = System.Windows.Size;

namespace QuickLook
{
Expand Down Expand Up @@ -54,14 +55,8 @@ internal ViewerWindow()

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().
// This is buggy for Windows 7 and 8: https://github.com/QL-Win/QuickLook/issues/644#issuecomment-628921704
if (App.IsWin10)
PreviewMouseDown += (sender, e) => this.BringToFront(false);

windowFrameContainer.PreviewMouseMove += ShowWindowCaptionContainer;

Topmost = SettingHelper.Get("Topmost", false);
buttonTop.Tag = Topmost ? "Top" : "Auto";

Expand Down Expand Up @@ -103,32 +98,6 @@ internal ViewerWindow()
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);

// The non-focusable trick is buggy for Windows 7 and 8
// https://github.com/QL-Win/QuickLook/issues/644#issuecomment-628921704
if (App.IsWin10)
{
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();
Expand Down

0 comments on commit a7115f6

Please sign in to comment.