Update Piano Sheet after changing Keyboard Layout

sabihoshi · Jun 5, 2021 · 41e5d60 · 41e5d60
1 parent 235a808
commit 41e5d60
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
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>2.2.0.1</Version>
+    <Version>2.2.1</Version>
     <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>

diff --git a/GenshinLyreMidiPlayer.WPF/ViewModels/PianoSheetViewModel.cs b/GenshinLyreMidiPlayer.WPF/ViewModels/PianoSheetViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using GenshinLyreMidiPlayer.WPF.Core;
@@ -50,6 +51,13 @@ public uint Shorten
             set => SetAndNotify(ref _shorten, Math.Max(value, 1));
         }
 
+        [OnChangedMethod(nameof(Update))]
+        public KeyValuePair<Keyboard.Layout, string> SelectedLayout
+        {
+            get => SettingsPage.SelectedLayout; 
+            set => SettingsPage.SelectedLayout = value;
+        }
+
         protected override void OnActivate() { Update(); }
 
         public void Update()

diff --git a/GenshinLyreMidiPlayer.WPF/Views/PianoSheetView.xaml b/GenshinLyreMidiPlayer.WPF/Views/PianoSheetView.xaml
@@ -39,7 +39,7 @@
                 <GroupBox Header="Layout">
                     <ComboBox
                         ItemsSource="{x:Static core:Keyboard.LayoutNames}"
-                        SelectedItem="{Binding SettingsPage.SelectedLayout}"
+                        SelectedItem="{Binding SelectedLayout}"
                         SelectedIndex="{Binding Default.SelectedLayout, Source={StaticResource Settings}}"
                         DisplayMemberPath="Value" />
                 </GroupBox>