Fix context menu bug and ui changes

Author: Jed556

AutoMidiPlayer.WPF/AutoMidiPlayer.WPF.csproj

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

AutoMidiPlayer.WPF/ModernWPF/BindingProxy.cs

@@ -0,0 +1,25 @@
+using System.Windows;
+
+namespace AutoMidiPlayer.WPF.ModernWPF;
+
+/// <summary>
+/// A proxy class that allows binding to the DataContext from elements
+/// that are not part of the visual tree (like ContextMenus in NotifyIcon).
+/// </summary>
+public class BindingProxy : Freezable
+{
+    public static readonly DependencyProperty DataProperty =
+        DependencyProperty.Register(nameof(Data), typeof(object), typeof(BindingProxy),
+            new PropertyMetadata(null));
+
+    public object? Data
+    {
+        get => GetValue(DataProperty);
+        set => SetValue(DataProperty, value);
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return new BindingProxy();
+    }
+}

AutoMidiPlayer.WPF/ViewModels/QueueViewModel.cs

@@ -60,9 +60,12 @@ private void OnTrackViewPropertyChanged(object? sender, System.ComponentModel.Pr
         }
     }
 
-    public BindableCollection<MidiFile> FilteredTracks => string.IsNullOrWhiteSpace(FilterText)
-        ? Tracks
-        : new(Tracks.Where(t => t.Title.Contains(FilterText, StringComparison.OrdinalIgnoreCase)));
+    private BindableCollection<MidiFile> _filteredTracks = new();
+    public BindableCollection<MidiFile> FilteredTracks
+    {
+        get => _filteredTracks;
+        private set => SetAndNotify(ref _filteredTracks, value);
+    }
 
     public BindableCollection<MidiFile> Tracks { get; } = new();
 
@@ -184,12 +187,12 @@ public async void PlayPauseFromQueue(MidiFile? file)
     public void ClearQueue()
     {
         Tracks.Clear();
-        FilteredTracks.Clear();
         History.Clear();
 
         OpenedFile = null;
         SelectedFile = null;
         SaveQueue();
+        ApplyFilter();
     }
 
     public void RemoveTrack()
@@ -359,6 +362,7 @@ public void RestoreQueue(IEnumerable<MidiFile> availableTracks)
             ShuffledTracks = new(Tracks.OrderBy(_ => Guid.NewGuid()));
 
         RefreshQueue();
+        ApplyFilter();
     }
 
     /// <summary>
@@ -431,6 +435,7 @@ public void OnQueueModified()
     {
         SaveQueue();
         RefreshQueue();
+        ApplyFilter();
     }
 
     private void RefreshQueue()
@@ -442,15 +447,40 @@ private void RefreshQueue()
         }
     }
 
+    /// <summary>
+    /// Apply filter to create a new FilteredTracks collection
+    /// </summary>
+    public void ApplyFilter()
+    {
+        IEnumerable<MidiFile> filtered = string.IsNullOrWhiteSpace(FilterText)
+            ? Tracks
+            : Tracks.Where(t => t.Title.Contains(FilterText, StringComparison.OrdinalIgnoreCase));
+
+        FilteredTracks = new BindableCollection<MidiFile>(filtered);
+    }
+
+    /// <summary>
+    /// Called by PropertyChanged.Fody when FilterText changes
+    /// </summary>
+    private void OnFilterTextChanged() => ApplyFilter();
+
     /// <summary>
     /// Refresh the currently playing song in the list to reflect property changes
     /// </summary>
     public void RefreshCurrentSong()
     {
-        // Force UI to refresh by notifying FilteredTracks changed
+        // Force UI to refresh by recreating the filtered collection
+        // This ensures the ListView re-renders items when Song properties change
         System.Windows.Application.Current?.Dispatcher?.BeginInvoke(() =>
         {
-            NotifyOfPropertyChange(nameof(FilteredTracks));
+            ApplyFilter();
         });
     }
+
+    protected override void OnDeactivate()
+    {
+        base.OnDeactivate();
+        // Clear the semi-active (single-clicked) row when switching tabs
+        SelectedFile = null;
+    }
 }

AutoMidiPlayer.WPF/ViewModels/SongsViewModel.cs

@@ -445,4 +445,11 @@ public void RefreshCurrentSong()
         // Force a complete list refresh to show updated values
         ApplySort();
     }
+
+    protected override void OnDeactivate()
+    {
+        base.OnDeactivate();
+        // Clear the semi-active (single-clicked) row when switching tabs
+        SelectedFile = null;
+    }
 }

AutoMidiPlayer.WPF/ViewModels/TrackViewModel.cs

@@ -303,7 +303,11 @@ public async Task PlayPause()
         if (Playback is null)
             await InitializePlayback();
 
-        if (Playback!.IsRunning)
+        // If still null (no file opened), do nothing
+        if (Playback is null)
+            return;
+
+        if (Playback.IsRunning)
         {
             Playback.Stop();
             // Save position on pause

AutoMidiPlayer.WPF/Views/MainWindowView.xaml

@@ -13,6 +13,7 @@
 	xmlns:viewModels="clr-namespace:AutoMidiPlayer.WPF.ViewModels"
 	xmlns:core="clr-namespace:AutoMidiPlayer.WPF.Core"
 	d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
+	x:Name="MainWindow"
 	Title="{Binding Title}"
 	Height="650"
 	Width="1000"
@@ -24,6 +25,11 @@
 	WindowCornerPreference="Round"
 	WindowStartupLocation="CenterScreen">
 
+	<ui:UiWindow.Resources>
+		<modernWpf:BindingProxy x:Key="DataContextProxy"
+								Data="{Binding}"/>
+	</ui:UiWindow.Resources>
+
 	<Grid AllowDrop="True"
 		  Drop="{s:Action OnFileDrop}"
 		  DragOver="{s:Action OnDragOver}"
@@ -54,10 +60,12 @@
 							   TooltipText="MIDI Player">
 					<ui:NotifyIcon.Menu>
 						<ContextMenu>
-							<ui:MenuItem Command="{s:Action PlayPause, Target=TrackView}"
+							<ui:MenuItem s:View.ActionTarget="{Binding Data.TrackView, Source={StaticResource DataContextProxy}}"
+										 Command="{s:Action PlayPause}"
 										 Header="Play"
 										 SymbolIcon="Play16"/>
-							<ui:MenuItem Command="{s:Action Next, Target=TrackView}"
+							<ui:MenuItem s:View.ActionTarget="{Binding Data.TrackView, Source={StaticResource DataContextProxy}}"
+										 Command="{s:Action Next}"
 										 Header="Next"
 										 SymbolIcon="Next16"/>
 						</ContextMenu>