Fix "Merge nearby notes" incorrectly removing notes

sabihoshi · Oct 21, 2022 · 1a400a0 · 1a400a0
1 parent 53c9fa7
commit 1a400a0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/GenshinLyreMidiPlayer.Data/GenshinLyreMidiPlayer.Data.csproj b/GenshinLyreMidiPlayer.Data/GenshinLyreMidiPlayer.Data.csproj
@@ -10,10 +10,10 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-        <PackageReference Include="Melanchall.DryWetMidi" Version="6.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="6.0.8" />
+        <PackageReference Include="Melanchall.DryWetMidi" Version="6.1.3-prerelease1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-rc.2.22472.11" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.2.22472.11" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-rc.2.22472.11" />
         <PackageReference Include="Stylet" Version="1.3.6" />
     </ItemGroup>
 

diff --git a/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj b/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj
@@ -6,7 +6,7 @@
         <UseWPF>true</UseWPF>
         <StartupObject>GenshinLyreMidiPlayer.WPF.App</StartupObject>
         <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Version>4.0.4</Version>
+        <Version>4.0.5</Version>
         <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
         <Nullable>enable</Nullable>
         <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>
@@ -25,12 +25,12 @@
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
         <PackageReference Include="InputSimulator" Version="1.0.4" />
         <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-        <PackageReference Include="Melanchall.DryWetMidi" Version="6.1.2" />
-        <PackageReference Include="ModernWpfUI" Version="0.9.6" />
+        <PackageReference Include="Melanchall.DryWetMidi" Version="6.1.3-prerelease1" />
+        <PackageReference Include="ModernWpfUI" Version="0.9.7-preview.2" />
         <PackageReference Include="ModernWpfUI.MahApps" Version="0.9.5" />
-        <PackageReference Include="PropertyChanged.Fody" Version="4.0.1" />
+        <PackageReference Include="PropertyChanged.Fody" Version="4.0.5" />
         <PackageReference Include="Stylet" Version="1.3.6" />
-        <PackageReference Include="WPF-UI" Version="2.0.2" />
+        <PackageReference Include="WPF-UI" Version="2.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/GenshinLyreMidiPlayer.WPF/Views/MainWindowView.xaml b/GenshinLyreMidiPlayer.WPF/Views/MainWindowView.xaml
@@ -44,8 +44,10 @@
 				<ui:NotifyIcon FocusOnLeftClick="True" MenuOnRightClick="True" TooltipText="MIDI Player">
 					<ui:NotifyIcon.Menu>
                         <ContextMenu>
+                            <!-- ReSharper disable Xaml.RedundantResource -->
                             <ui:MenuItem Command="{s:Action PlayPause, Target=PlaylistView}" Header="Play" SymbolIcon="Play16" />
-							<ui:MenuItem Command="{s:Action Next}" Header="Next" SymbolIcon="Next16" />
+                            <ui:MenuItem Command="{s:Action Next}" Header="Next" SymbolIcon="Next16" />
+                            <!-- ReSharper restore Xaml.RedundantResource -->
 						</ContextMenu>
 					</ui:NotifyIcon.Menu>
 				</ui:NotifyIcon>
@@ -95,7 +97,7 @@
 						Grid.Row="0" Margin="18"
 						HorizontalAlignment="Left" VerticalAlignment="Top"
 						FontSize="24" Navigation="{Binding ElementName=RootNavigation, Mode=OneWay}" />
-					<Frame x:Name="RootFrame" Visibility="Hidden" />
+					<Frame Grid.Row="0" x:Name="RootFrame" Visibility="Hidden" />
 					<modernWpf:AnimatedContentControl Grid.Row="1" Margin="10" s:View.Model="{Binding ActiveItem}" />
 				</Grid>
 			</Border>

diff --git a/GenshinLyreMidiPlayer.WPF/Views/PianoSheetView.xaml b/GenshinLyreMidiPlayer.WPF/Views/PianoSheetView.xaml
@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d"
 
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:modern="http://schemas.modernwpf.com/2019"
     xmlns:s="https://github.com/canton7/Stylet"
 

diff --git a/GenshinLyreMidiPlayer.WPF/Views/PlaylistView.xaml b/GenshinLyreMidiPlayer.WPF/Views/PlaylistView.xaml
@@ -125,7 +125,7 @@
             HorizontalAlignment="Center">
             <Button Command="{s:Action ToggleShuffle}">
 	            <ui:FontIcon Glyph="&#xE14B;" FontFamily="Segoe MDL2 Assets"
-	                         Foreground="{Binding Playlist.ShuffleStateColor}" />
+	                         Foreground="{Binding ShuffleStateColor}" />
             </Button>
             <Button Command="{s:Action ToggleLoop}">
                 <ui:FontIcon Glyph="{Binding LoopStateString}" FontFamily="Segoe MDL2 Assets" />