子窗口优化

Author: clansty

MaiChartManager/Browser.cs

@@ -32,34 +32,37 @@ public Browser(string loopbackUrl)
         PositionOnScreen();
     }
 
-    private void PositionOnScreen()
+    private static Point CalculatePosition(int width, int height)
     {
-        StartPosition = FormStartPosition.Manual;
-
         // 优先选择横屏显示器
         var landscape = Screen.AllScreens.FirstOrDefault(s => s.WorkingArea.Width >= s.WorkingArea.Height);
         if (landscape != null)
         {
             // 在横屏显示器中间显示
             var area = landscape.WorkingArea;
-            Location = new Point(
-                area.X + (area.Width - Width) / 2,
-                area.Y + (area.Height - Height) / 2
+            return new Point(
+                area.X + (area.Width - width) / 2,
+                area.Y + (area.Height - height) / 2
             );
-            return;
         }
 
         // 只有竖屏显示器，在底部正方形区域中间显示
         var portrait = Screen.PrimaryScreen ?? Screen.AllScreens[0];
         var pArea = portrait.WorkingArea;
-        var squareSize = pArea.Width; // 正方形边长 = 屏幕宽度
-        var squareTop = pArea.Bottom - squareSize; // 正方形区域的顶部 Y 坐标
-        Location = new Point(
-            pArea.X + (squareSize - Width) / 2,
-            squareTop + (squareSize - Height) / 2
+        var squareSize = pArea.Width;
+        var squareTop = pArea.Bottom - squareSize;
+        return new Point(
+            pArea.X + (squareSize - width) / 2,
+            squareTop + (squareSize - height) / 2
         );
     }
 
+    private void PositionOnScreen()
+    {
+        StartPosition = FormStartPosition.Manual;
+        Location = CalculatePosition(Width, Height);
+    }
+
     private void webView21_CoreWebView2InitializationCompleted(object sender, CoreWebView2InitializationCompletedEventArgs e)
     {
         if (IsRunningAsUwp())
@@ -72,9 +75,7 @@ private void webView21_CoreWebView2InitializationCompleted(object sender, CoreWe
             Text += " (Unsupported)";
         }
 
-        // 这里如果直接写 mcm 的话会让启动的时候白屏时间更久
-        webView21.CoreWebView2.SetVirtualHostNameToFolderMapping("mcm.invalid", Path.Combine(StaticSettings.exeDir, "wwwroot"), CoreWebView2HostResourceAccessKind.Deny);
-        webView21.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync($"globalThis.backendUrl = `{loopbackUrl.ToString().TrimEnd('/')}`");
+        SetupCoreWebView2(webView21.CoreWebView2);
 
         // webView21.CoreWebView2.AddWebResourceRequestedFilter("*://mcm.invalid/MaiChartManagerServlet/*", CoreWebView2WebResourceContext.All);
         // webView21.CoreWebView2.WebResourceRequested += OnWebResourceRequested;
@@ -83,10 +84,51 @@ private void webView21_CoreWebView2InitializationCompleted(object sender, CoreWe
         webView21.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
     }
 
-    private void CoreWebView2_NewWindowRequested(object? sender, CoreWebView2NewWindowRequestedEventArgs e)
+    private async void CoreWebView2_NewWindowRequested(object? sender, CoreWebView2NewWindowRequestedEventArgs e)
     {
-        e.Handled = true;
-        Process.Start(new ProcessStartInfo(e.Uri) { UseShellExecute = true });
+        if (new Uri(e.Uri).Host != "mcm.invalid")
+        {
+            e.Handled = true;
+            Process.Start(new ProcessStartInfo(e.Uri) { UseShellExecute = true });
+            return;
+        }
+        var deferral = e.GetDeferral();
+        try
+        {
+            var features = e.WindowFeatures;
+            var dpiScale = DeviceDpi / 96.0;
+            var width = (int)((features.HasSize ? features.Width : 960) * dpiScale);
+            var height = (int)((features.HasSize ? features.Height : 640) * dpiScale);
+            var form = new Form
+            {
+                Text = "MaiChartManager",
+                Icon = Icon,
+                Width = width,
+                Height = height,
+                StartPosition = FormStartPosition.Manual,
+                Location = CalculatePosition(width, height),
+            };
+            var webView = new Microsoft.Web.WebView2.WinForms.WebView2 { Dock = DockStyle.Fill };
+            form.Controls.Add(webView);
+            form.Show();
+            await webView.EnsureCoreWebView2Async(webView21.CoreWebView2.Environment);
+            SetupCoreWebView2(webView.CoreWebView2);
+            e.NewWindow = webView.CoreWebView2;
+            webView.CoreWebView2.DocumentTitleChanged += (_, _) => form.Text = webView.CoreWebView2.DocumentTitle;
+            form.FormClosed += (_, _) => webView.Dispose();
+        }
+        finally
+        {
+            deferral.Complete();
+        }
+    }
+
+    private void SetupCoreWebView2(CoreWebView2 coreWebView2)
+    {
+        // 这里如果直接写 mcm 的话会让启动的时候白屏时间更久
+        // 注意注意，这个东西访问的时候必须要自己手动加 index.html，这个坑已经踩两次了
+        coreWebView2.SetVirtualHostNameToFolderMapping("mcm.invalid", StaticSettings.wwwroot, CoreWebView2HostResourceAccessKind.Deny);
+        coreWebView2.AddScriptToExecuteOnDocumentCreatedAsync($"globalThis.backendUrl = `{loopbackUrl.ToString().TrimEnd('/')}`");
     }
 
     private async void OnWebResourceRequested(object? sender, CoreWebView2WebResourceRequestedEventArgs args)

MaiChartManager/Front/src/views/Charts/MusicEdit/PreviewChartButton.tsx

@@ -18,7 +18,8 @@ export default defineComponent({
       const height = 640;
       const left = (screen.width - width) / 2;
       const top = (screen.height - height) / 2;
-      const url = `/#/chart-preview?${params}`;
+      const url = new URL(location.href);
+      url.hash = `/chart-preview?${params}`;
       window.open(url, '_blank', `width=${width},height=${height},left=${left},top=${top},menubar=no,toolbar=no,location=no,status=no`);
     };
 

MaiChartManager/ServerManager.cs

@@ -198,7 +198,7 @@ public static void StartApp(bool export, Action? onStart = null)
         if (export)
             app.UseFileServer(new FileServerOptions
             {
-                FileProvider = new PhysicalFileProvider(Path.Combine(StaticSettings.exeDir, "wwwroot")),
+                FileProvider = new PhysicalFileProvider(StaticSettings.wwwroot),
             });
         app.MapControllers();
         Task.Run(app.Run);

MaiChartManager/StaticSettings.cs

@@ -11,6 +11,13 @@ public partial class StaticSettings
     public static readonly string tempPath = Path.Combine(Path.GetTempPath(), "MaiChartManager");
     public static readonly string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "MaiChartManager");
     public static readonly string exeDir = Path.GetDirectoryName(Application.ExecutablePath);
+#if DEBUG
+    public static readonly string wwwroot = Path.Combine(ProjectDir, "wwwroot");
+    private static string ProjectDir => Path.GetDirectoryName(GetThisFilePath())!;
+    private static string GetThisFilePath([System.Runtime.CompilerServices.CallerFilePath] string? path = null) => path!;
+#else
+    public static readonly string wwwroot = Path.Combine(exeDir, "wwwroot");
+#endif
 
     private static string _imageAssetsDir = "LocalAssets";
     private static string _movieAssetsDir = "LocalAssets";