Fix edit dialog not showing up

Author: Jed556

AutoMidiPlayer.WPF/AutoMidiPlayer.WPF.csproj

@@ -6,7 +6,7 @@
         <UseWPF>true</UseWPF>
         <StartupObject>AutoMidiPlayer.WPF.App</StartupObject>
         <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Version>6.6.2</Version>
+        <Version>6.6.3</Version>
         <ApplicationIcon>logo.ico</ApplicationIcon>
         <Nullable>enable</Nullable>
         <RepositoryUrl>https://github.com/Jed556/AutoMidiPlayer</RepositoryUrl>

AutoMidiPlayer.WPF/ModernWPF/DialogHelper.cs

@@ -0,0 +1,36 @@
+using System.Linq;
+using System.Windows;
+using Wpf.Ui.Controls;
+
+namespace AutoMidiPlayer.WPF.ModernWPF;
+
+/// <summary>
+/// Helper class for creating ContentDialogs with proper DialogHost setup.
+/// </summary>
+public static class DialogHelper
+{
+    /// <summary>
+    /// Creates a new ContentDialog with the DialogHostEx property already set.
+    /// </summary>
+    public static ContentDialog CreateDialog()
+    {
+        var dialog = new ContentDialog();
+        SetupDialogHost(dialog);
+        return dialog;
+    }
+
+    /// <summary>
+    /// Sets up the DialogHostEx property for an existing ContentDialog.
+    /// </summary>
+    public static void SetupDialogHost(ContentDialog dialog)
+    {
+        var activeWindow = Application.Current.Windows.OfType<Window>().FirstOrDefault(w => w.IsActive)
+                           ?? Application.Current.MainWindow;
+        if (activeWindow != null)
+        {
+            var dialogHost = ContentDialogHost.GetForWindow(activeWindow);
+            if (dialogHost != null)
+                dialog.DialogHostEx = dialogHost;
+        }
+    }
+}

AutoMidiPlayer.WPF/ModernWPF/ImportDialog.cs

@@ -8,6 +8,15 @@ namespace AutoMidiPlayer.WPF.ModernWPF;
 
 public class ImportDialog : ContentDialog
 {
+    static ImportDialog()
+    {
+        // Ensure the base ContentDialog style is applied to this derived dialog.
+        DefaultStyleKeyProperty.OverrideMetadata(
+            typeof(ImportDialog),
+            new FrameworkPropertyMetadata(typeof(ContentDialog))
+        );
+    }
+
     private readonly Wpf.Ui.Controls.TextBox _titleBox;
     private readonly Wpf.Ui.Controls.TextBox _authorBox;
     private readonly Wpf.Ui.Controls.TextBox _albumBox;
@@ -69,6 +78,40 @@ public uint SongMergeMilliseconds
 
     public ImportDialog(string defaultTitle, int defaultKey = 0, Transpose defaultTranspose = Transpose.Ignore, string? defaultAuthor = null, string? defaultAlbum = null, DateTime? defaultDateAdded = null, double nativeBpm = 120, double? customBpm = null, bool? mergeNotes = null, uint? mergeMilliseconds = null, bool? holdNotes = null)
     {
+        // Set up the DialogHost for this ContentDialog
+        DialogHelper.SetupDialogHost(this);
+
+        if (Application.Current.TryFindResource(typeof(ContentDialog)) is Style dialogStyle)
+        {
+            Style = dialogStyle;
+        }
+
+        // Keep the dialog within the active window bounds to avoid clipping on fullscreen toggle.
+        var activeWindow = Application.Current.Windows.OfType<Window>().FirstOrDefault(w => w.IsActive)
+                           ?? Application.Current.MainWindow;
+        if (activeWindow != null)
+        {
+            void UpdateDialogBounds()
+            {
+                var maxHeight = Math.Max(0, activeWindow.ActualHeight - 120);
+                var maxWidth = Math.Max(0, activeWindow.ActualWidth - 120);
+                DialogMaxHeight = maxHeight;
+                DialogMaxWidth = maxWidth;
+                DialogMargin = new Thickness(24);
+            }
+
+            UpdateDialogBounds();
+            SizeChangedEventHandler? sizeChangedHandler = (_, _) => UpdateDialogBounds();
+            activeWindow.SizeChanged += sizeChangedHandler;
+            EventHandler? stateChangedHandler = (_, _) => UpdateDialogBounds();
+            activeWindow.StateChanged += stateChangedHandler;
+            Closed += (_, _) =>
+            {
+                activeWindow.SizeChanged -= sizeChangedHandler;
+                activeWindow.StateChanged -= stateChangedHandler;
+            };
+        }
+
         Title = "Edit Song";
         PrimaryButtonText = "Save";
         CloseButtonText = "Cancel";

AutoMidiPlayer.WPF/ViewModels/SettingsPageViewModel.cs

@@ -489,15 +489,12 @@ public async Task CheckForUpdate()
 
     public async Task LocationMissing()
     {
-        var dialog = new ContentDialog
-        {
-            Title = "Error",
-            Content = "Could not find Game's Location, please find GenshinImpact.exe, YuanShen.exe, or xdt.exe (Heartopia)",
-
-            PrimaryButtonText = "Find Manually...",
-            SecondaryButtonText = "Ignore (Notes might not play)",
-            CloseButtonText = "Exit"
-        };
+        var dialog = DialogHelper.CreateDialog();
+        dialog.Title = "Error";
+        dialog.Content = "Could not find Game's Location, please find GenshinImpact.exe, YuanShen.exe, or xdt.exe (Heartopia)";
+        dialog.PrimaryButtonText = "Find Manually...";
+        dialog.SecondaryButtonText = "Ignore (Notes might not play)";
+        dialog.CloseButtonText = "Exit";
 
         var result = await dialog.ShowAsync();
 
@@ -633,13 +630,10 @@ private async Task<bool> TrySetLocationAsync(string? location)
         if (!File.Exists(location)) return false;
         if (Path.GetFileName(location).Equals("launcher.exe", StringComparison.OrdinalIgnoreCase))
         {
-            var dialog = new ContentDialog
-            {
-                Title = "Incorrect Location",
-                Content = "launcher.exe is not the game, please find GenshinImpact.exe, YuanShen.exe, or xdt.exe (Heartopia)",
-
-                CloseButtonText = "Ok"
-            };
+            var dialog = DialogHelper.CreateDialog();
+            dialog.Title = "Incorrect Location";
+            dialog.Content = "launcher.exe is not the game, please find GenshinImpact.exe, YuanShen.exe, or xdt.exe (Heartopia)";
+            dialog.CloseButtonText = "Ok";
 
             await dialog.ShowAsync();
             return false;

AutoMidiPlayer.WPF/ViewModels/SongsViewModel.cs

@@ -298,13 +298,11 @@ public async Task ShowMissingFilesDialog()
 
         content.Children.Add(listView);
 
-        var dialog = new ContentDialog
-        {
-            Title = "Missing Files",
-            Content = content,
-            PrimaryButtonText = "Remove All",
-            CloseButtonText = "Close"
-        };
+        var dialog = DialogHelper.CreateDialog();
+        dialog.Title = "Missing Files";
+        dialog.Content = content;
+        dialog.PrimaryButtonText = "Remove All";
+        dialog.CloseButtonText = "Close";
 
         var result = await dialog.ShowAsync();
 
@@ -405,14 +403,12 @@ private async Task AddFile(string fileName)
             if (existingByHash != null)
             {
                 // Show warning dialog about duplicate
-                var dialog = new ContentDialog
-                {
-                    Title = "Duplicate File Detected",
-                    Content = $"This MIDI file appears to be a duplicate of:\n\n" +
+                var dialog = DialogHelper.CreateDialog();
+                dialog.Title = "Duplicate File Detected";
+                dialog.Content = $"This MIDI file appears to be a duplicate of:\n\n" +
                               $"'{existingByHash.Song.Title ?? existingByHash.Song.Path}'\n\n" +
-                              $"The existing file will be used and this duplicate will be ignored.",
-                    CloseButtonText = "OK"
-                };
+                              $"The existing file will be used and this duplicate will be ignored.";
+                dialog.CloseButtonText = "OK";
                 await dialog.ShowAsync();
                 return;
             }