fix identifymonitor

DGP-Studio · Nov 5, 2024 · 1bf5c30 · 1bf5c30
1 parent 0364a76
commit 1bf5c30
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Window/IdentifyMonitorWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Window/IdentifyMonitorWindow.xaml.cs
@@ -16,10 +16,10 @@ public IdentifyMonitorWindow(DisplayArea displayArea, int index)
         InitializeComponent();
         Monitor = $"{displayArea.DisplayId.Value:X8}:{index}";
 
-        CompactOverlayPresenter presenter = CompactOverlayPresenter.Create();
-        presenter.InitialSize = CompactOverlaySize.Small;
+        OverlappedPresenter presenter = OverlappedPresenter.CreateForContextMenu();
+        presenter.IsAlwaysOnTop = true;
+        presenter.SetBorderAndTitleBar(false, false);
         AppWindow.SetPresenter(presenter);
-        AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
 
         PointInt32 point = new(40, 32);
         SizeInt32 size = displayArea.WorkArea.GetSizeInt32().Scale(0.1);

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Window/WebView2/WebView2Window.xaml.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Window/WebView2/WebView2Window.xaml.cs
@@ -58,18 +58,7 @@ public WebView2Window(WindowId parentWindowId, IWebView2ContentProvider contentP
 
     public new void Activate()
     {
-        if (!IsWindowVisible(parentHWND))
-        {
-            ShowWindow(parentHWND, SHOW_WINDOW_CMD.SW_SHOW);
-        }
-
-        if (IsIconic(parentHWND))
-        {
-            ShowWindow(parentHWND, SHOW_WINDOW_CMD.SW_RESTORE);
-        }
-
-        SetForegroundWindow(parentHWND);
-
+        WindowExtension.SwitchTo(parentHWND);
         EnableWindow(parentHWND, false);
         base.Activate();
 

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/WindowExtension.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/WindowExtension.cs
@@ -65,7 +65,11 @@ public static void Show(this Window window)
 
     public static void SwitchTo(this Window window)
     {
-        HWND hwnd = window.GetWindowHandle();
+        SwitchTo(window.GetWindowHandle());
+    }
+
+    public static void SwitchTo(HWND hwnd)
+    {
         if (!IsWindowVisible(hwnd))
         {
             ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_SHOW);