From 9fa45457588aee786a7fcc0c7133b21fa83194ed Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Sat, 7 Oct 2023 16:51:23 +0800
Subject: [PATCH 1/4] show scale degree

---
 OpenUtau.Core/Commands/ProjectCommands.cs   | 12 +++++++
 OpenUtau.Core/Ustx/UProject.cs              |  1 +
 OpenUtau.Core/Util/MusicMath.cs             | 30 ++++++++++++++++
 OpenUtau.Core/Util/Preferences.cs           |  1 +
 OpenUtau/Controls/TrackBackground.cs        | 38 ++++++++++++++++++---
 OpenUtau/Strings/Strings.axaml              |  5 +++
 OpenUtau/ViewModels/PlaybackViewModel.cs    | 13 +++++++
 OpenUtau/ViewModels/PreferencesViewModel.cs |  7 ++++
 OpenUtau/Views/KeyDialog.axaml              | 21 ++++++++++++
 OpenUtau/Views/KeyDialog.axaml.cs           | 30 ++++++++++++++++
 OpenUtau/Views/MainWindow.axaml             | 12 +++++--
 OpenUtau/Views/MainWindow.axaml.cs          | 13 ++++++-
 OpenUtau/Views/PreferencesDialog.axaml      |  6 ++++
 13 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 OpenUtau/Views/KeyDialog.axaml
 create mode 100644 OpenUtau/Views/KeyDialog.axaml.cs

diff --git a/OpenUtau.Core/Commands/ProjectCommands.cs b/OpenUtau.Core/Commands/ProjectCommands.cs
index a61b8d8d4..f279c32c2 100644
--- a/OpenUtau.Core/Commands/ProjectCommands.cs
+++ b/OpenUtau.Core/Commands/ProjectCommands.cs
@@ -140,6 +140,18 @@ public override void Unexecute() {
         }
     }
 
+    public class KeyCommand : ProjectCommand{
+        public readonly int oldKey;
+        public readonly int newKey;
+        public KeyCommand(UProject project, int key) : base(project) {
+            oldKey = project.key;
+            newKey = key;
+        }
+        public override string ToString() => $"Change key from {oldKey} to {newKey}";
+        public override void Execute() => project.key = newKey;
+        public override void Unexecute() => project.key = oldKey;
+    }
+
     public class ConfigureExpressionsCommand : ProjectCommand {
         readonly UExpressionDescriptor[] oldDescriptors;
         readonly UExpressionDescriptor[] newDescriptors;
diff --git a/OpenUtau.Core/Ustx/UProject.cs b/OpenUtau.Core/Ustx/UProject.cs
index 0bbf5193f..974fb00c7 100644
--- a/OpenUtau.Core/Ustx/UProject.cs
+++ b/OpenUtau.Core/Ustx/UProject.cs
@@ -48,6 +48,7 @@ public class UProject {
         public string[] expSelectors = new string[] { Format.Ustx.DYN, Format.Ustx.PITD, Format.Ustx.CLR, Format.Ustx.ENG, Format.Ustx.VEL };
         public int expPrimary = 0;
         public int expSecondary = 1;
+        public int key = 0;//Music key of the project, 0 = C, 1 = C#, 2 = D, ..., 11 = B
         public List<UTimeSignature> timeSignatures;
         public List<UTempo> tempos;
         public List<UTrack> tracks;
diff --git a/OpenUtau.Core/Util/MusicMath.cs b/OpenUtau.Core/Util/MusicMath.cs
index 4a4b85d60..f8123bd9a 100644
--- a/OpenUtau.Core/Util/MusicMath.cs
+++ b/OpenUtau.Core/Util/MusicMath.cs
@@ -32,6 +32,36 @@ public enum KeyColor { White, Black }
             { "B", 11 },
         };
 
+        public static readonly string[] Solfeges = { 
+            "do",
+            "",
+            "re",
+            "",
+            "mi",
+            "fa",
+            "",
+            "sol",
+            "",
+            "la",
+            "",
+            "ti",
+        };
+
+        public static readonly string[] NumberedNotations = {
+            "1",
+            "",
+            "2",
+            "",
+            "3",
+            "4",
+            "",
+            "5",
+            "",
+            "6",
+            "",
+            "7",
+        };
+
         public static string GetToneName(int noteNum) {
             return noteNum < 0 ? string.Empty : KeysInOctave[noteNum % 12].Item1 + (noteNum / 12 - 1).ToString();
         }
diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index b2ef443c5..88f80b679 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -112,6 +112,7 @@ public class SerializablePreferences {
             public bool ShowPrefs = true;
             public bool ShowTips = true;
             public int Theme;
+            public int DegreeStyle;
             public bool UseTrackColor = false;
             public bool ClearCacheOnQuit = false;
             public bool PreRender = true;
diff --git a/OpenUtau/Controls/TrackBackground.cs b/OpenUtau/Controls/TrackBackground.cs
index e44606742..0b4a1e441 100644
--- a/OpenUtau/Controls/TrackBackground.cs
+++ b/OpenUtau/Controls/TrackBackground.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Linq;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
 using OpenUtau.Core;
+using OpenUtau.Core.Util;
 using ReactiveUI;
 
 namespace OpenUtau.App.Controls {
@@ -65,12 +67,29 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             }
         }
 
+        int mod(int a, int b){
+            return (a % b + b) % b;
+        }
+
         public override void Render(DrawingContext context) {
             if (TrackHeight == 0) {
                 return;
             }
             int track = (int)TrackOffset;
             double top = TrackHeight * (track - TrackOffset);
+            int key = DocManager.Inst.Project == null ? 0 : DocManager.Inst.Project.key;
+            string[] degreeNames;
+            switch(Preferences.Default.DegreeStyle){
+                case 1:
+                    degreeNames = MusicMath.Solfeges;
+                    break;
+                case 2:
+                    degreeNames = MusicMath.NumberedNotations;
+                    break;
+                default:
+                    degreeNames = Enumerable.Repeat("", 12).ToArray();
+                    break;
+            }
             while (top < Bounds.Height) {
                 bool isAltTrack = IsAltTrack(track) ^ (ThemeManager.IsDarkMode && !IsKeyboard);
                 bool isCenterKey = IsKeyboard && IsCenterKey(track);
@@ -85,11 +104,20 @@ public override void Render(DrawingContext context) {
                     brush = isCenterKey ? ThemeManager.CenterKeyNameBrush
                         : isAltTrack ? ThemeManager.BlackKeyNameBrush
                             : ThemeManager.WhiteKeyNameBrush;
-                    string toneName = MusicMath.GetToneName(ViewConstants.MaxTone - 1 - track);
-                    var textLayout = TextLayoutCache.Get(toneName, brush, 12);
-                    var textPosition = new Point(Bounds.Width - 4 - (int)textLayout.Width, (int)(top + (TrackHeight - textLayout.Height) / 2));
-                    using (var state = context.PushTransform(Matrix.CreateTranslation(textPosition))) {
-                        textLayout.Draw(context, new Point());
+                    int tone = ViewConstants.MaxTone - 1 - track;
+                    string toneName = MusicMath.GetToneName(tone);
+                    var toneTextLayout = TextLayoutCache.Get(toneName, brush, 12);
+                    var toneTextPosition = new Point(Bounds.Width - 4 - (int)toneTextLayout.Width, (int)(top + (TrackHeight - toneTextLayout.Height) / 2));
+                    using (var state = context.PushTransform(Matrix.CreateTranslation(toneTextPosition))) {
+                        toneTextLayout.Draw(context, new Point());
+                    }
+                    //scale degree display
+                    int degree = mod(tone - key, 12);
+                    string degreeName = degreeNames[degree];
+                    var degreeTextLayout = TextLayoutCache.Get(degreeName, brush, 12);
+                    var degreeTextPosition = new Point(4, (int)(top + (TrackHeight - degreeTextLayout.Height) / 2));
+                    using (var state = context.PushTransform(Matrix.CreateTranslation(degreeTextPosition))) {
+                        degreeTextLayout.Draw(context, new Point());
                     }
                 }
                 track++;
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 2797c2935..448735777 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -34,6 +34,7 @@
   <system:String x:Key="dialogs.export.savefirst">Save project file first</system:String>
   <system:String x:Key="dialogs.installdll.caption">Installing phonemizer</system:String>
   <system:String x:Key="dialogs.installdll.message">Installing </system:String>
+  <system:String x:Key="dialogs.key.caption">Key</system:String>
   <system:String x:Key="dialogs.messagebox.cancel">Cancel</system:String>
   <system:String x:Key="dialogs.messagebox.no">No</system:String>
   <system:String x:Key="dialogs.messagebox.ok">Ok</system:String>
@@ -284,6 +285,10 @@
   <system:String x:Key="prefs.advanced.stable">Stable</system:String>
   <system:String x:Key="prefs.advanced.vlabelerpath">vLabeler Path</system:String>
   <system:String x:Key="prefs.appearance">Appearance</system:String>
+  <system:String x:Key="prefs.appearance.degree">Scale degree display style</system:String>
+  <system:String x:Key="prefs.appearance.degree.numbered">Numbered (1 2 3 4 5 6 7)</system:String>
+  <system:String x:Key="prefs.appearance.degree.off">Off</system:String>
+  <system:String x:Key="prefs.appearance.degree.solfege">Solfège (do re mi fa sol la ti)</system:String>
   <system:String x:Key="prefs.appearance.lang">Language</system:String>
   <system:String x:Key="prefs.appearance.showghostnotes">Show other tracks' notes on piano roll</system:String>
   <system:String x:Key="prefs.appearance.showportrait">Show portrait on piano roll</system:String>
diff --git a/OpenUtau/ViewModels/PlaybackViewModel.cs b/OpenUtau/ViewModels/PlaybackViewModel.cs
index de6c4eadf..dcfd82a75 100644
--- a/OpenUtau/ViewModels/PlaybackViewModel.cs
+++ b/OpenUtau/ViewModels/PlaybackViewModel.cs
@@ -11,6 +11,8 @@ public class PlaybackViewModel : ViewModelBase, ICmdSubscriber {
         public int BeatPerBar => Project.timeSignatures[0].beatPerBar;
         public int BeatUnit => Project.timeSignatures[0].beatUnit;
         public double Bpm => Project.tempos[0].bpm;
+        public int Key => Project.key;
+        public string KeyName => MusicMath.KeysInOctave[Key].Item1;
         public int Resolution => Project.resolution;
         public int PlayPosTick => DocManager.Inst.playPosTick;
         public TimeSpan PlayPosTime => TimeSpan.FromMilliseconds((int)Project.timeAxis.TickPosToMsPos(DocManager.Inst.playPosTick));
@@ -61,6 +63,15 @@ public void SetBpm(double bpm) {
             DocManager.Inst.EndUndoGroup();
         }
 
+        public void SetKey(int key) {
+            if (key == DocManager.Inst.Project.key) {
+                return;
+            }
+            DocManager.Inst.StartUndoGroup();
+            DocManager.Inst.ExecuteCmd(new KeyCommand(Project, key));
+            DocManager.Inst.EndUndoGroup();
+        }
+
         public void OnNext(UCommand cmd, bool isUndo) {
             if (cmd is BpmCommand ||
                 cmd is TimeSignatureCommand ||
@@ -68,10 +79,12 @@ cmd is AddTempoChangeCommand ||
                 cmd is DelTempoChangeCommand ||
                 cmd is AddTimeSigCommand ||
                 cmd is DelTimeSigCommand ||
+                cmd is KeyCommand ||
                 cmd is LoadProjectNotification) {
                 this.RaisePropertyChanged(nameof(BeatPerBar));
                 this.RaisePropertyChanged(nameof(BeatUnit));
                 this.RaisePropertyChanged(nameof(Bpm));
+                this.RaisePropertyChanged(nameof(KeyName));
                 MessageBus.Current.SendMessage(new TimeAxisChangedEvent());
                 if (cmd is LoadProjectNotification) {
                     DocManager.Inst.ExecuteCmd(new SetPlayPosTickNotification(0));
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 6b348aed7..e8d7414ea 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -40,6 +40,7 @@ public AudioOutputDevice? AudioOutputDevice {
         [Reactive] public GpuInfo OnnxGpu { get; set; }
         [Reactive] public bool HighThreads { get; set; }
         [Reactive] public int Theme { get; set; }
+        [Reactive] public int DegreeStyle { get; set; }
         [Reactive] public bool UseTrackColor { get; set; }
         [Reactive] public bool ShowPortrait { get; set; }
         [Reactive] public bool ShowGhostNotes { get; set; }
@@ -131,6 +132,7 @@ public PreferencesViewModel() {
             OnnxGpuOptions = Onnx.getGpuInfo();
             OnnxGpu = OnnxGpuOptions.FirstOrDefault(x => x.deviceId == Preferences.Default.OnnxGpu, OnnxGpuOptions[0]);
             Theme = Preferences.Default.Theme;
+            DegreeStyle = Preferences.Default.DegreeStyle;
             UseTrackColor = Preferences.Default.UseTrackColor;
             ShowPortrait = Preferences.Default.ShowPortrait;
             ShowGhostNotes = Preferences.Default.ShowGhostNotes;
@@ -202,6 +204,11 @@ public PreferencesViewModel() {
                     Preferences.Save();
                     App.SetTheme();
                 });
+            this.WhenAnyValue(vm => vm.DegreeStyle)
+                .Subscribe(degreeStyle => {
+                    Preferences.Default.DegreeStyle = degreeStyle;
+                    Preferences.Save();
+                });
             this.WhenAnyValue(vm => vm.UseTrackColor)
                 .Subscribe(trackColor => {
                     Preferences.Default.UseTrackColor = trackColor;
diff --git a/OpenUtau/Views/KeyDialog.axaml b/OpenUtau/Views/KeyDialog.axaml
new file mode 100644
index 000000000..aca4ab3e6
--- /dev/null
+++ b/OpenUtau/Views/KeyDialog.axaml
@@ -0,0 +1,21 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        x:Class="OpenUtau.App.Views.KeyDialog"
+        Title="{DynamicResource dialogs.key.caption}"
+        Height="100" Width="320" WindowStartupLocation="CenterOwner"
+        ExtendClientAreaToDecorationsHint="False">
+  <StackPanel VerticalAlignment="Center" Margin="{Binding $parent.WindowDecorationMargin}">
+    <Grid ColumnDefinitions="1*,1*" Margin="4,0">
+      <TextBlock Grid.Column="0" Margin="4" HorizontalAlignment="Stretch"
+                Text="1="/>
+      <ComboBox Grid.Column="1" Margin="4" HorizontalAlignment="Stretch"
+                ItemsSource="{Binding KeyNames}"
+                SelectedIndex="{Binding Key}"/>
+    </Grid>
+    <Button Content="OK" Margin="8,4" HorizontalAlignment="Stretch"
+            Click="OnOkButtonClick"/>
+  </StackPanel>
+</Window>
diff --git a/OpenUtau/Views/KeyDialog.axaml.cs b/OpenUtau/Views/KeyDialog.axaml.cs
new file mode 100644
index 000000000..02913f8c3
--- /dev/null
+++ b/OpenUtau/Views/KeyDialog.axaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using ReactiveUI.Fody.Helpers;
+
+using OpenUtau.Core;
+
+namespace OpenUtau.App.Views {
+    public partial class KeyDialog : Window {
+        static readonly List<string> keyNames = Enumerable.Range(0, 12)
+            .Select(i => MusicMath.KeysInOctave[i].Item1)
+            .ToList();
+
+        public List<string> KeyNames => keyNames;
+        [Reactive] public int Key { get; set; }
+        public Action<int>? OnOk { get; set; }
+        public KeyDialog() : this(0) { }
+        public KeyDialog(int key) {
+            InitializeComponent();
+            Key=key;
+            DataContext = this;
+        }
+        private void OnOkButtonClick(object sender, RoutedEventArgs args) {
+            OnOk?.Invoke(Key);
+            Close();
+        }
+    }
+}
diff --git a/OpenUtau/Views/MainWindow.axaml b/OpenUtau/Views/MainWindow.axaml
index 8a4d2b23d..047c8c004 100644
--- a/OpenUtau/Views/MainWindow.axaml
+++ b/OpenUtau/Views/MainWindow.axaml
@@ -89,7 +89,7 @@
           </MenuItem>
         </Menu>
         <Panel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="24">
-          <Border Classes="playback" Width="72" HorizontalAlignment="Left" Margin="4,0">
+          <Border Classes="playback" Width="96" HorizontalAlignment="Left" Margin="4,0">
             <Grid>
               <TextBlock Width="28" HorizontalAlignment="Left"
                          Background="Transparent" PointerPressed="OnEditTimeSignature">
@@ -100,7 +100,7 @@
                   </MultiBinding>
                 </TextBlock.Text>
               </TextBlock>
-              <TextBlock Width="42" HorizontalAlignment="Right"
+              <TextBlock Width="42" HorizontalAlignment="Center"
                           Background="Transparent" PointerPressed="OnEditBpm">
                 <TextBlock.Text>
                   <MultiBinding StringFormat="{}{0:#0.00}">
@@ -108,6 +108,14 @@
                   </MultiBinding>
                 </TextBlock.Text>
               </TextBlock>
+              <TextBlock Width="28" HorizontalAlignment="Right"
+                         Background="Transparent" PointerPressed="OnEditKey">
+                <TextBlock.Text>
+                  <MultiBinding StringFormat="{}{0}">
+                    <Binding Path="PlaybackViewModel.KeyName"/>
+                  </MultiBinding>
+                </TextBlock.Text>
+              </TextBlock>
             </Grid>
           </Border>
           <Border Classes="playback" Width="88" HorizontalAlignment="Center">
diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
index 7ec9e5a06..8445196fd 100644
--- a/OpenUtau/Views/MainWindow.axaml.cs
+++ b/OpenUtau/Views/MainWindow.axaml.cs
@@ -117,6 +117,17 @@ void OnEditBpm(object sender, PointerPressedEventArgs args) {
             args.Pointer.Capture(null);
         }
 
+        void OnEditKey(object sender, PointerPressedEventArgs args) {
+            var project = DocManager.Inst.Project;
+            var dialog = new KeyDialog(project.key);
+            dialog.OnOk = key => {
+                viewModel.PlaybackViewModel.SetKey(key);
+            };
+            dialog.ShowDialog(this);
+            // Workaround for https://github.com/AvaloniaUI/Avalonia/issues/3986
+            args.Pointer.Capture(null);
+        }
+
         private void AddTempoChange(int tick) {
             var project = DocManager.Inst.Project;
             var dialog = new TypeInDialog {
@@ -1111,4 +1122,4 @@ public void OnNext(UCommand cmd, bool isUndo) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 42aee228f..6f8339207 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -152,6 +152,12 @@
               <ComboBoxItem Content="{DynamicResource prefs.appearance.theme.dark}"/>
             </ComboBox>
             <TextBlock Classes="restart"/>
+            <TextBlock Text="{DynamicResource prefs.appearance.degree}" Margin="0,10,0,0"/>
+            <ComboBox SelectedIndex="{Binding DegreeStyle}">
+              <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.off}"/>
+              <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.solfege}"/>
+              <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.numbered}"/>
+            </ComboBox>
             <Grid Margin="0,5,0,0">
               <TextBlock Text="{DynamicResource prefs.appearance.trackcolor}" HorizontalAlignment="Left"/>
               <ToggleSwitch IsChecked="{Binding UseTrackColor}"/>

From f38aba195560faa58222c33e6ab5f5c523fbceb2 Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Sat, 7 Oct 2023 19:56:43 +0800
Subject: [PATCH 2/4] make key a view option of piano roll

---
 OpenUtau/ViewModels/NotesViewModel.cs   | 25 +++++++++++++++++++++
 OpenUtau/Views/KeyDialog.axaml          | 21 -----------------
 OpenUtau/Views/KeyDialog.axaml.cs       | 30 -------------------------
 OpenUtau/Views/MainWindow.axaml         | 12 ++--------
 OpenUtau/Views/MainWindow.axaml.cs      | 13 +----------
 OpenUtau/Views/PianoRollWindow.axaml    | 14 ++++++++++++
 OpenUtau/Views/PianoRollWindow.axaml.cs | 13 +++++++++++
 7 files changed, 55 insertions(+), 73 deletions(-)
 delete mode 100644 OpenUtau/Views/KeyDialog.axaml
 delete mode 100644 OpenUtau/Views/KeyDialog.axaml.cs

diff --git a/OpenUtau/ViewModels/NotesViewModel.cs b/OpenUtau/ViewModels/NotesViewModel.cs
index 896a0d0f5..89c4530aa 100644
--- a/OpenUtau/ViewModels/NotesViewModel.cs
+++ b/OpenUtau/ViewModels/NotesViewModel.cs
@@ -65,6 +65,7 @@ public class NotesViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public bool ShowNoteParams { get; set; }
         [Reactive] public bool IsSnapOn { get; set; }
         [Reactive] public string SnapDivText { get; set; }
+        [Reactive] public string KeyText { get; set; }
         [Reactive] public Rect ExpBounds { get; set; }
         [Reactive] public string PrimaryKey { get; set; }
         [Reactive] public bool PrimaryKeyNotSupported { get; set; }
@@ -85,8 +86,10 @@ public class NotesViewModel : ViewModelBase, ICmdSubscriber {
         public double VScrollBarMax => Math.Max(0, TrackCount - ViewportTracks);
         public UProject Project => DocManager.Inst.Project;
         [Reactive] public List<MenuItemViewModel> SnapDivs { get; set; }
+        [Reactive] public List<MenuItemViewModel> Keys { get; set; }
 
         public ReactiveCommand<int, Unit> SetSnapUnitCommand { get; set; }
+        public ReactiveCommand<int, Unit> SetKeyCommand { get; set; }
 
         // See the comments on TracksViewModel.playPosXToTickOffset
         private double playPosXToTickOffset => ViewportTicks / Bounds.Width;
@@ -111,6 +114,14 @@ public NotesViewModel() {
                 UpdateSnapDiv();
             });
 
+            Keys = new List<MenuItemViewModel>();
+            SetKeyCommand = ReactiveCommand.Create<int>(key => {
+                DocManager.Inst.StartUndoGroup();
+                DocManager.Inst.ExecuteCmd(new KeyCommand(Project, key));
+                DocManager.Inst.EndUndoGroup();
+                UpdateKey();
+            });
+
             viewportTicks = this.WhenAnyValue(x => x.Bounds, x => x.TickWidth)
                 .Select(v => v.Item1.Width / Math.Max(v.Item2, ViewConstants.TickWidthMin))
                 .ToProperty(this, x => x.ViewportTicks);
@@ -173,6 +184,13 @@ public NotesViewModel() {
                             Command = SetSnapUnitCommand,
                             CommandParameter = div,
                         }));
+                    Keys.Clear();
+                    Keys.AddRange(MusicMath.KeysInOctave
+                        .Select((key, index) => new MenuItemViewModel {
+                            Header = $"1={key.Item1}",
+                            Command = SetKeyCommand,
+                            CommandParameter = index,
+                        }));
                 });
 
             CursorTool = false;
@@ -193,6 +211,7 @@ public NotesViewModel() {
             ShowTips = Preferences.Default.ShowTips;
             IsSnapOn = true;
             SnapDivText = string.Empty;
+            KeyText = string.Empty;
 
             PlayTone = Preferences.Default.PlayTone;
             this.WhenAnyValue(x => x.PlayTone)
@@ -267,6 +286,11 @@ private void UpdateSnapDiv() {
             SnapDivText = $"(1/{div})";
         }
 
+        private void UpdateKey(){
+            int key = Project.key;
+            KeyText = "1="+MusicMath.KeysInOctave[key].Item1;
+        }
+
         public void OnXZoomed(Point position, double delta) {
             bool recenter = true;
             if (TickOffset == 0 && position.X < 0.1) {
@@ -378,6 +402,7 @@ private void LoadPart(UPart part, UProject project) {
             LoadPortrait(part, project);
             LoadWindowTitle(part, project);
             LoadTrackColor(part, project);
+            UpdateKey();
         }
 
         private void LoadPortrait(UPart? part, UProject? project) {
diff --git a/OpenUtau/Views/KeyDialog.axaml b/OpenUtau/Views/KeyDialog.axaml
deleted file mode 100644
index aca4ab3e6..000000000
--- a/OpenUtau/Views/KeyDialog.axaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        x:Class="OpenUtau.App.Views.KeyDialog"
-        Title="{DynamicResource dialogs.key.caption}"
-        Height="100" Width="320" WindowStartupLocation="CenterOwner"
-        ExtendClientAreaToDecorationsHint="False">
-  <StackPanel VerticalAlignment="Center" Margin="{Binding $parent.WindowDecorationMargin}">
-    <Grid ColumnDefinitions="1*,1*" Margin="4,0">
-      <TextBlock Grid.Column="0" Margin="4" HorizontalAlignment="Stretch"
-                Text="1="/>
-      <ComboBox Grid.Column="1" Margin="4" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding KeyNames}"
-                SelectedIndex="{Binding Key}"/>
-    </Grid>
-    <Button Content="OK" Margin="8,4" HorizontalAlignment="Stretch"
-            Click="OnOkButtonClick"/>
-  </StackPanel>
-</Window>
diff --git a/OpenUtau/Views/KeyDialog.axaml.cs b/OpenUtau/Views/KeyDialog.axaml.cs
deleted file mode 100644
index 02913f8c3..000000000
--- a/OpenUtau/Views/KeyDialog.axaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI.Fody.Helpers;
-
-using OpenUtau.Core;
-
-namespace OpenUtau.App.Views {
-    public partial class KeyDialog : Window {
-        static readonly List<string> keyNames = Enumerable.Range(0, 12)
-            .Select(i => MusicMath.KeysInOctave[i].Item1)
-            .ToList();
-
-        public List<string> KeyNames => keyNames;
-        [Reactive] public int Key { get; set; }
-        public Action<int>? OnOk { get; set; }
-        public KeyDialog() : this(0) { }
-        public KeyDialog(int key) {
-            InitializeComponent();
-            Key=key;
-            DataContext = this;
-        }
-        private void OnOkButtonClick(object sender, RoutedEventArgs args) {
-            OnOk?.Invoke(Key);
-            Close();
-        }
-    }
-}
diff --git a/OpenUtau/Views/MainWindow.axaml b/OpenUtau/Views/MainWindow.axaml
index 047c8c004..8a4d2b23d 100644
--- a/OpenUtau/Views/MainWindow.axaml
+++ b/OpenUtau/Views/MainWindow.axaml
@@ -89,7 +89,7 @@
           </MenuItem>
         </Menu>
         <Panel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="24">
-          <Border Classes="playback" Width="96" HorizontalAlignment="Left" Margin="4,0">
+          <Border Classes="playback" Width="72" HorizontalAlignment="Left" Margin="4,0">
             <Grid>
               <TextBlock Width="28" HorizontalAlignment="Left"
                          Background="Transparent" PointerPressed="OnEditTimeSignature">
@@ -100,7 +100,7 @@
                   </MultiBinding>
                 </TextBlock.Text>
               </TextBlock>
-              <TextBlock Width="42" HorizontalAlignment="Center"
+              <TextBlock Width="42" HorizontalAlignment="Right"
                           Background="Transparent" PointerPressed="OnEditBpm">
                 <TextBlock.Text>
                   <MultiBinding StringFormat="{}{0:#0.00}">
@@ -108,14 +108,6 @@
                   </MultiBinding>
                 </TextBlock.Text>
               </TextBlock>
-              <TextBlock Width="28" HorizontalAlignment="Right"
-                         Background="Transparent" PointerPressed="OnEditKey">
-                <TextBlock.Text>
-                  <MultiBinding StringFormat="{}{0}">
-                    <Binding Path="PlaybackViewModel.KeyName"/>
-                  </MultiBinding>
-                </TextBlock.Text>
-              </TextBlock>
             </Grid>
           </Border>
           <Border Classes="playback" Width="88" HorizontalAlignment="Center">
diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
index 8445196fd..7ec9e5a06 100644
--- a/OpenUtau/Views/MainWindow.axaml.cs
+++ b/OpenUtau/Views/MainWindow.axaml.cs
@@ -117,17 +117,6 @@ void OnEditBpm(object sender, PointerPressedEventArgs args) {
             args.Pointer.Capture(null);
         }
 
-        void OnEditKey(object sender, PointerPressedEventArgs args) {
-            var project = DocManager.Inst.Project;
-            var dialog = new KeyDialog(project.key);
-            dialog.OnOk = key => {
-                viewModel.PlaybackViewModel.SetKey(key);
-            };
-            dialog.ShowDialog(this);
-            // Workaround for https://github.com/AvaloniaUI/Avalonia/issues/3986
-            args.Pointer.Capture(null);
-        }
-
         private void AddTempoChange(int tick) {
             var project = DocManager.Inst.Project;
             var dialog = new TypeInDialog {
@@ -1122,4 +1111,4 @@ public void OnNext(UCommand cmd, bool isUndo) {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenUtau/Views/PianoRollWindow.axaml b/OpenUtau/Views/PianoRollWindow.axaml
index 4cd9c01a1..f9fabc1c0 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml
+++ b/OpenUtau/Views/PianoRollWindow.axaml
@@ -364,6 +364,20 @@
                   </ContextMenu>
                 </Button.ContextMenu>
               </Button>
+              <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton">
+                <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
+                           TextAlignment="Right" FontSize="10" FontFamily="monospace"
+                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+                <Button.ContextMenu>
+                  <ContextMenu Name="KeyMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.Keys}" KeyDown="OnKeyKeyDown">
+                    <ContextMenu.DataTemplates>
+                      <DataTemplate DataType="vm:MenuItemViewModel">
+                        <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
+                      </DataTemplate>
+                    </ContextMenu.DataTemplates>
+                  </ContextMenu>
+                </Button.ContextMenu>
+              </Button>
             </StackPanel>
           </Border>
         </Border>
diff --git a/OpenUtau/Views/PianoRollWindow.axaml.cs b/OpenUtau/Views/PianoRollWindow.axaml.cs
index f85129c9f..459f30910 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml.cs
+++ b/OpenUtau/Views/PianoRollWindow.axaml.cs
@@ -802,6 +802,19 @@ void OnSnapDivKeyDown(object sender, KeyEventArgs e) {
             }
         }
 
+        public void OnKeyMenuButton(object sender, RoutedEventArgs args) {
+            KeyMenu.PlacementTarget = sender as Button;
+            KeyMenu.Open();
+        }
+
+        void OnKeyKeyDown(object sender, KeyEventArgs e) {
+            if (e.Key == Key.Enter && e.KeyModifiers == KeyModifiers.None) {
+                if (sender is ContextMenu menu && menu.SelectedItem is MenuItemViewModel item) {
+                    item.Command?.Execute(item.CommandParameter);
+                }
+            }
+        }
+
         #region value tip
 
         void IValueTip.ShowValueTip() {

From b230415f73fc9a8a01a2399cbbf6170cc89d71e7 Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Tue, 10 Oct 2023 14:25:20 +0800
Subject: [PATCH 3/4] resolve conflict

---
 OpenUtau/Views/PianoRollWindow.axaml | 541 +++++++++++++--------------
 1 file changed, 259 insertions(+), 282 deletions(-)

diff --git a/OpenUtau/Views/PianoRollWindow.axaml b/OpenUtau/Views/PianoRollWindow.axaml
index f9fabc1c0..a6c6f13e9 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml
+++ b/OpenUtau/Views/PianoRollWindow.axaml
@@ -14,10 +14,10 @@
   <Window.Styles>
     <StyleInclude Source="/Styles/PianoRollStyles.axaml"/>
   </Window.Styles>
-  <Grid>
-  <Border>
+  <Border Grid.Row="1">
     <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="{Binding $parent[2].WindowDecorationMargin}">
       <Grid.RowDefinitions>
+        <RowDefinition Height="24"/>
         <RowDefinition Height="24"/>
         <RowDefinition Height="24"/>
         <RowDefinition Height="*" MinHeight="200"/>
@@ -31,14 +31,14 @@
         <ColumnDefinition Width="24"/>
         <ColumnDefinition Width="Auto"/>
       </Grid.ColumnDefinitions>
-      <Grid Grid.Column="0" Grid.Row="0" Grid.RowSpan="2">
+      <Grid Grid.Column="0" Grid.Row="1" Grid.RowSpan="2">
         <Rectangle HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="12" Fill="{Binding NotesViewModel.TrackAccentColor}"/>
         <Border Margin="12,0,0,0" Width="48" Height="48" ClipToBounds="True">
           <Image HorizontalAlignment="Center" VerticalAlignment="Center"
                  Width="50" Height="50" Stretch="UniformToFill" Source="{Binding NotesViewModel.Avatar}"/>
         </Border>
       </Grid>
-      <ScrollBar Name="HScrollBar" Classes="music" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+      <ScrollBar Name="HScrollBar" Classes="music" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                  Margin="0,4,0,4" Orientation="Horizontal" AllowAutoHide="False"
                  DataContext="{Binding NotesViewModel}"
                  Maximum="{Binding HScrollBarMax, Mode=OneWay}"
@@ -46,7 +46,7 @@
                  ViewportSize="{Binding ViewportTicks}"
                  LargeChange="{Binding ViewportTicks}"
                  SmallChange="{Binding SmallChangeX}" PointerWheelChanged="HScrollPointerWheelChanged"/>
-      <ScrollBar Name="VScrollBar" Classes="music" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+      <ScrollBar Name="VScrollBar" Classes="music" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                  Margin="4,0,4,0" Orientation="Vertical" AllowAutoHide="False"
                  DataContext="{Binding NotesViewModel}"
                  Maximum="{Binding VScrollBarMax, Mode=OneWay}"
@@ -54,7 +54,7 @@
                  ViewportSize="{Binding ViewportTracks}"
                  LargeChange="{Binding ViewportTracks}"
                  SmallChange="{Binding SmallChangeY}" PointerWheelChanged="VScrollPointerWheelChanged"/>
-      <c:TrackBackground Grid.Column="0" Grid.Row="2" IsPianoRoll="True" IsKeyboard="True"
+      <c:TrackBackground Grid.Column="0" Grid.Row="3" IsPianoRoll="True" IsKeyboard="True"
                          DataContext="{Binding NotesViewModel}"
                          TrackHeight="{Binding TrackHeight}"
                          TrackOffset="{Binding TrackOffset}"
@@ -62,7 +62,7 @@
                          PointerPressed="KeyboardPointerPressed"
                          PointerMoved="KeyboardPointerMoved"
                          PointerReleased="KeyboardPointerReleased"/>
-      <Grid Grid.Column="0" Grid.Row="4">
+      <Grid Grid.Column="0" Grid.Row="5">
         <c:ExpSelector Name="expSelector1" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Top"
                        Index="0" Margin="0,0,0,0" ToolTip.Tip="Alt + 1"/>
         <c:ExpSelector Name="expSelector2" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Top"
@@ -86,7 +86,7 @@
           </Path>
         </Button>
       </Grid>
-      <Canvas Name="TimelineCanvas" Grid.Row="1" Grid.Column="1"
+      <Canvas Name="TimelineCanvas" Grid.Row="2" Grid.Column="1"
               Background="Transparent" ClipToBounds="True"
               PointerWheelChanged="TimelinePointerWheelChanged"
               PointerPressed="TimelinePointerPressed"
@@ -98,13 +98,13 @@
               Fill="{DynamicResource NeutralAccentBrushSemi}"
               Data="M -6.5 0 L 6.5 0 L 6.5 3 L 0 9 L -6.5 3 Z"/>
       </Canvas>
-      <c:TrackBackground Grid.Row="2" Grid.Column="1" IsHitTestVisible="False"
+      <c:TrackBackground Grid.Row="3" Grid.Column="1" IsHitTestVisible="False"
                          Foreground="{DynamicResource TrackBackgroundAltBrush}"
                          DataContext="{Binding NotesViewModel}"
                          Bounds="{Binding Bounds, Mode=OneWayToSource}"
                          TrackHeight="{Binding TrackHeight}"
                          TrackOffset="{Binding TrackOffset}" IsPianoRoll="True"/>
-      <c:TickBackground Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" IsHitTestVisible="False"
+      <c:TickBackground Grid.Row="2" Grid.RowSpan="2" Grid.Column="1" IsHitTestVisible="False"
                         Foreground="{DynamicResource TickLineBrush}"
                         Background="{DynamicResource TickLineBrushLow}"
                         Resolution="{Binding PlaybackViewModel.Resolution}"
@@ -114,16 +114,16 @@
                         SnapDiv="{Binding NotesViewModel.SnapDiv, Mode=OneWay}"
                         SnapTicks="{Binding NotesViewModel.SnapTicks}"
                         ShowBarNumber="True"/>
-      <Image Grid.Row="2" Grid.RowSpan="3" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,100,0"
+      <Image Grid.Row="3" Grid.RowSpan="3" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,100,0"
              Source="{Binding NotesViewModel.Portrait}" OpacityMask="{Binding NotesViewModel.PortraitMask}" Stretch="None"/>
-      <Border Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+      <Border Grid.Row="3" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
               Margin="0,0,0,60" Height="60" IsHitTestVisible="False">
         <c:WaveformImage DataContext="{Binding NotesViewModel, Mode=OneWay}"
                          TickWidth="{Binding TickWidth, Mode=OneWay}"
                          TickOffset="{Binding TickOffset, Mode=OneWay}"
                          ShowWaveform="{Binding ShowWaveform, Mode=OneWay}"/>
       </Border>
-      <c:NotesCanvas Grid.Row="2" Grid.Column="1"
+      <c:NotesCanvas Grid.Row="3" Grid.Column="1"
                      TickWidth="{Binding NotesViewModel.TickWidth}"
                      TrackHeight="{Binding NotesViewModel.TrackHeight}"
                      TickOffset="{Binding NotesViewModel.TickOffset}"
@@ -152,7 +152,7 @@
           </ContextMenu>
         </c:NotesCanvas.ContextMenu>
       </c:NotesCanvas>
-      <Canvas Grid.Row="2" Grid.Column="1" IsHitTestVisible="False" ClipToBounds="True">
+      <Canvas Grid.Row="3" Grid.Column="1" IsHitTestVisible="False" ClipToBounds="True">
         <Rectangle Name="PlayPosHighlight"
                    Width="{Binding NotesViewModel.PlayPosHighlightWidth, Mode=OneWay}"
                    Height="{Binding $parent.Bounds.Height, Mode=OneWay}"
@@ -164,268 +164,246 @@
                    Fill="{DynamicResource TickLineBrushLow}" ZIndex="1000"
                    IsHitTestVisible="False" IsVisible="False"/>
       </Canvas>
-      <StackPanel Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
-                  Margin="12,12,0,0" Orientation="Horizontal">
-        <Border CornerRadius="2" BoxShadow="0 0 5 1 #1F000000"
-                Background="{DynamicResource SystemControlBackgroundAltHighBrush}">
-          <Border CornerRadius="2" ClipToBounds="True">
-            <StackPanel Orientation="Horizontal">
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2"
-                            IsChecked="{Binding NotesViewModel.CursorTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="1"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.selectionv2}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M10.07,14.27C10.57,14.03 11.16,14.25 11.4,14.75L13.7,19.74L15.5,18.89L13.19,13.91C12.95,13.41 13.17,12.81 13.67,12.58L13.95,12.5L16.25,12.05L8,5.12V15.9L9.82,14.43L10.07,14.27M13.64,21.97C13.14,22.21 12.54,22 12.31,21.5L10.13,16.76L7.62,18.78C7.45,18.92 7.24,19 7,19A1,1 0 0,1 6,18V3A1,1 0 0,1 7,2C7.24,2 7.47,2.09 7.64,2.23L7.65,2.22L19.14,11.86C19.57,12.22 19.62,12.85 19.27,13.27C19.12,13.45 18.91,13.57 18.7,13.61L15.54,14.23L17.74,18.96C18,19.46 17.76,20.05 17.26,20.28L13.64,21.97Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".55" ScaleY=".55" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
-                            IsChecked="{Binding NotesViewModel.PenTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.penv2}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
-                            IsChecked="{Binding NotesViewModel.PenPlusTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2+"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.penplus}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M14.1,9L15,9.9L5.9,19H5V18.1L14.1,9M17.7,3C17.5,3 17.2,3.1 17,3.3L15.2,5.1L18.9,8.9L20.7,7C21.1,6.6 21.1,6 20.7,5.6L18.4,3.3C18.2,3.1 17.9,3 17.7,3M14.1,6.2L3,17.2V21H6.8L17.8,9.9L14.1,6.2M7,2V5H10V7H7V10H5V7H2V5H5V2H7Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-1" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
-                            IsChecked="{Binding NotesViewModel.EraserTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="3"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.eraser}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M16.24,3.56L21.19,8.5C21.97,9.29 21.97,10.55 21.19,11.34L12,20.53C10.44,22.09 7.91,22.09 6.34,20.53L2.81,17C2.03,16.21 2.03,14.95 2.81,14.16L13.41,3.56C14.2,2.78 15.46,2.78 16.24,3.56M4.22,15.58L7.76,19.11C8.54,19.9 9.8,19.9 10.59,19.11L14.12,15.58L9.17,10.63L4.22,15.58Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
-                            IsChecked="{Binding NotesViewModel.DrawPitchTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.drawpitch}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M9.75 20.85C11.53 20.15 11.14 18.22 10.24 17C9.35 15.75 8.12 14.89 6.88 14.06C6 13.5 5.19 12.8 4.54 12C4.26 11.67 3.69 11.06 4.27 10.94C4.86 10.82 5.88 11.4 6.4 11.62C7.31 12 8.21 12.44 9.05 12.96L10.06 11.26C8.5 10.23 6.5 9.32 4.64 9.05C3.58 8.89 2.46 9.11 2.1 10.26C1.78 11.25 2.29 12.25 2.87 13.03C4.24 14.86 6.37 15.74 7.96 17.32C8.3 17.65 8.71 18.04 8.91 18.5C9.12 18.94 9.07 18.97 8.6 18.97C7.36 18.97 5.81 18 4.8 17.36L3.79 19.06C5.32 20 7.88 21.47 9.75 20.85M20.84 5.25C21.06 5.03 21.06 4.67 20.84 4.46L19.54 3.16C19.33 2.95 18.97 2.95 18.76 3.16L17.74 4.18L19.82 6.26M11 10.92V13H13.08L19.23 6.85L17.15 4.77L11 10.92Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".7" ScaleY=".7" />
-                        <TranslateTransform X="-1" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
-                            IsChecked="{Binding NotesViewModel.KnifeTool, Mode=OneWay}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="5"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.knife}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M7.22,11.91C6.89,12.24 6.71,12.65 6.66,13.08L12.17,15.44L20.66,6.96C21.44,6.17 21.44,4.91 20.66,4.13L19.24,2.71C18.46,1.93 17.2,1.93 16.41,2.71L7.22,11.91M5,16V21.75L10.81,16.53L5.81,14.53L5,16M17.12,4.83C17.5,4.44 18.15,4.44 18.54,4.83C18.93,5.23 18.93,5.86 18.54,6.25C18.15,6.64 17.5,6.64 17.12,6.25C16.73,5.86 16.73,5.23 17.12,4.83Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-1" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-            </StackPanel>
-          </Border>
+      <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Orientation="Horizontal">
+        <Border>
+          <Menu Grid.Column="1" Grid.Row="0" Height="20" Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
+                Closed="OnMenuClosed" PointerExited="OnMenuPointerLeave">
+            <MenuItem Header="{DynamicResource pianoroll.menu.part}">
+              <MenuItem Header="{DynamicResource pianoroll.menu.part.singer}" Click="OnMenuSingers"/>
+              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" Click="OnMenuSearchNote"/>
+            </MenuItem>
+            <MenuItem Header="{DynamicResource pianoroll.menu.batch}">
+              <MenuItem Header="{DynamicResource pianoroll.menu.notes}" ItemsSource="{Binding NoteBatchEdits}">
+                <MenuItem.DataTemplates>
+                  <DataTemplate DataType="vm:MenuItemViewModel">
+                    <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
+                  </DataTemplate>
+                </MenuItem.DataTemplates>
+              </MenuItem>
+              <MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}">
+                <MenuItem.DataTemplates>
+                  <DataTemplate DataType="vm:MenuItemViewModel">
+                    <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
+                  </DataTemplate>
+                </MenuItem.DataTemplates>
+              </MenuItem>
+              <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu">
+                <MenuItem.DataTemplates>
+                  <DataTemplate DataType="vm:MenuItemViewModel">
+                    <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}" Height="{Binding Height}"/>
+                  </DataTemplate>
+                </MenuItem.DataTemplates>
+              </MenuItem>
+            </MenuItem>
+            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" Click="OnMenuEditLyrics"/>
+            <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
+          </Menu>
         </Border>
-        <Border Width="12" Height="20"/>
-        <Border CornerRadius="2" BoxShadow="0 0 5 1 #1F000000"
-                Background="{DynamicResource SystemControlBackgroundAltHighBrush}">
-          <Border CornerRadius="2" ClipToBounds="True">
-            <StackPanel Orientation="Horizontal">
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2" IsChecked="{Binding NotesViewModel.ShowTips}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.tips}">
-                <Grid Width="18" Height="18">
-                  <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="?" FontWeight="Bold"
-                             Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.PlayTone}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.tone}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M21,3V15.5A3.5,3.5 0 0,1 17.5,19A3.5,3.5 0 0,1 14,15.5A3.5,3.5 0 0,1 17.5,12C18.04,12 18.55,12.12 19,12.34V6.47L9,8.6V17.5A3.5,3.5 0 0,1 5.5,21A3.5,3.5 0 0,1 2,17.5A3.5,3.5 0 0,1 5.5,14C6.04,14 6.55,14.12 7,14.34V6L21,3Z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowVibrato}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.vibrato}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="stroked" Data="M-6.5 1 L-6 1.5 L-4.5 0 L-2 2.5 L0.5 0 L3 2.5 L6.5 -1 L6 -1.5 L4.5 0 L2 -2.5 L-0.5 0 L-3 -2.5 Z">
-                    <Path.RenderTransform>
-                      <TranslateTransform X="9" Y="9"/>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPitch}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.pitch}">
-                <Grid Width="18" Height="18">
-                  <Ellipse Classes="stroked" Height="4" Width="4" Margin="2,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
-                  <Ellipse Classes="stroked" Height="4" Width="4" Margin="0,5,2,0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
-                  <Path Classes="stroked" Data="M 6.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 11.5 6.5"/>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowFinalPitch}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.finalpitch}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="stroked" Data="M 5.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 12.5 6.5"/>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowWaveform}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.waveform}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M22 12L20 13L19 14L18 13L17 16L16 13L15 21L14 13L13 15L12 13L11 17L10 13L9 22L8 13L7 19L6 13L5 14L4 13L2 12L4 11L5 10L6 11L7 5L8 11L9 2L10 11L11 7L12 11L13 9L14 11L15 3L16 11L17 8L18 11L19 10L20 11L22 12Z">
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".67" ScaleY=".67" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPhoneme}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.phoneme}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="stroked" Data="M 3 13 L 6 5.5 L 12 5.5 L 15 13"/>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.noteparams}">
-                <Grid Width="18" Height="18">
-                  <Path Classes="filled" Data="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z">
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".65" ScaleY=".65" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-              </ToggleButton>
-              <ToggleButton Name="SnapToggle" Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.IsSnapOn}"
-                            ToolTip.Tip="{DynamicResource pianoroll.toggle.snap}">
-                <Border Width="18" Height="18">
-                  <Path Classes="stroked" Data="M 4.5 13.5 L 7.5 13.5 L 7.5 9.5 A 1,1 0 1 1 10.5,9.5 L 10.5 13.5 L 13.5 13.5 L 13.5 8.5 A 1,1 0 1 0 4.5,8.5 Z"/>
-                </Border>
-              </ToggleButton>
-              <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton">
-                <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
-                           TextAlignment="Right" FontSize="10" FontFamily="monospace"
-                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-                <Button.ContextMenu>
-                  <ContextMenu Name="SnapDivMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.SnapDivs}" KeyDown="OnSnapDivKeyDown">
-                    <ContextMenu.DataTemplates>
-                      <DataTemplate DataType="vm:MenuItemViewModel">
-                        <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
-                      </DataTemplate>
-                    </ContextMenu.DataTemplates>
-                  </ContextMenu>
-                </Button.ContextMenu>
-              </Button>
-              <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton">
-                <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
-                           TextAlignment="Right" FontSize="10" FontFamily="monospace"
-                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-                <Button.ContextMenu>
-                  <ContextMenu Name="KeyMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.Keys}" KeyDown="OnKeyKeyDown">
-                    <ContextMenu.DataTemplates>
-                      <DataTemplate DataType="vm:MenuItemViewModel">
-                        <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
-                      </DataTemplate>
-                    </ContextMenu.DataTemplates>
-                  </ContextMenu>
-                </Button.ContextMenu>
-              </Button>
-            </StackPanel>
-          </Border>
+        <Border Width="24" Height="20"/>
+        <Border>
+          <StackPanel Orientation="Horizontal">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2"
+                          IsChecked="{Binding NotesViewModel.CursorTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="1"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.selectionv2}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M10.07,14.27C10.57,14.03 11.16,14.25 11.4,14.75L13.7,19.74L15.5,18.89L13.19,13.91C12.95,13.41 13.17,12.81 13.67,12.58L13.95,12.5L16.25,12.05L8,5.12V15.9L9.82,14.43L10.07,14.27M13.64,21.97C13.14,22.21 12.54,22 12.31,21.5L10.13,16.76L7.62,18.78C7.45,18.92 7.24,19 7,19A1,1 0 0,1 6,18V3A1,1 0 0,1 7,2C7.24,2 7.47,2.09 7.64,2.23L7.65,2.22L19.14,11.86C19.57,12.22 19.62,12.85 19.27,13.27C19.12,13.45 18.91,13.57 18.7,13.61L15.54,14.23L17.74,18.96C18,19.46 17.76,20.05 17.26,20.28L13.64,21.97Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".55" ScaleY=".55" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
+                          IsChecked="{Binding NotesViewModel.PenTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.penv2}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
+                          IsChecked="{Binding NotesViewModel.PenPlusTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2+"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.penplus}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M14.1,9L15,9.9L5.9,19H5V18.1L14.1,9M17.7,3C17.5,3 17.2,3.1 17,3.3L15.2,5.1L18.9,8.9L20.7,7C21.1,6.6 21.1,6 20.7,5.6L18.4,3.3C18.2,3.1 17.9,3 17.7,3M14.1,6.2L3,17.2V21H6.8L17.8,9.9L14.1,6.2M7,2V5H10V7H7V10H5V7H2V5H5V2H7Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                      <TranslateTransform X="-1" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
+                          IsChecked="{Binding NotesViewModel.EraserTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="3"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.eraser}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M16.24,3.56L21.19,8.5C21.97,9.29 21.97,10.55 21.19,11.34L12,20.53C10.44,22.09 7.91,22.09 6.34,20.53L2.81,17C2.03,16.21 2.03,14.95 2.81,14.16L13.41,3.56C14.2,2.78 15.46,2.78 16.24,3.56M4.22,15.58L7.76,19.11C8.54,19.9 9.8,19.9 10.59,19.11L14.12,15.58L9.17,10.63L4.22,15.58Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
+                          IsChecked="{Binding NotesViewModel.DrawPitchTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.drawpitch}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M9.75 20.85C11.53 20.15 11.14 18.22 10.24 17C9.35 15.75 8.12 14.89 6.88 14.06C6 13.5 5.19 12.8 4.54 12C4.26 11.67 3.69 11.06 4.27 10.94C4.86 10.82 5.88 11.4 6.4 11.62C7.31 12 8.21 12.44 9.05 12.96L10.06 11.26C8.5 10.23 6.5 9.32 4.64 9.05C3.58 8.89 2.46 9.11 2.1 10.26C1.78 11.25 2.29 12.25 2.87 13.03C4.24 14.86 6.37 15.74 7.96 17.32C8.3 17.65 8.71 18.04 8.91 18.5C9.12 18.94 9.07 18.97 8.6 18.97C7.36 18.97 5.81 18 4.8 17.36L3.79 19.06C5.32 20 7.88 21.47 9.75 20.85M20.84 5.25C21.06 5.03 21.06 4.67 20.84 4.46L19.54 3.16C19.33 2.95 18.97 2.95 18.76 3.16L17.74 4.18L19.82 6.26M11 10.92V13H13.08L19.23 6.85L17.15 4.77L11 10.92Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".7" ScaleY=".7" />
+                      <TranslateTransform X="-1" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
+                          IsChecked="{Binding NotesViewModel.KnifeTool, Mode=OneWay}"
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="5"
+                          ToolTip.Tip="{DynamicResource pianoroll.tool.knife}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M7.22,11.91C6.89,12.24 6.71,12.65 6.66,13.08L12.17,15.44L20.66,6.96C21.44,6.17 21.44,4.91 20.66,4.13L19.24,2.71C18.46,1.93 17.2,1.93 16.41,2.71L7.22,11.91M5,16V21.75L10.81,16.53L5.81,14.53L5,16M17.12,4.83C17.5,4.44 18.15,4.44 18.54,4.83C18.93,5.23 18.93,5.86 18.54,6.25C18.15,6.64 17.5,6.64 17.12,6.25C16.73,5.86 16.73,5.23 17.12,4.83Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                      <TranslateTransform X="-1" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+          </StackPanel>
         </Border>
-        <Border Width="12" Height="20"/>
-        <Border CornerRadius="2" BoxShadow="0 0 5 1 #1F000000">
-          <Border CornerRadius="2" ClipToBounds="True">
-            <Menu CornerRadius="2" Height="20" Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
-                  Closed="OnMenuClosed" PointerExited="OnMenuPointerLeave">
-              <MenuItem Header="{DynamicResource pianoroll.menu.part}">
-                <MenuItem Header="{DynamicResource pianoroll.menu.part.singer}" Click="OnMenuSingers"/>
-                <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" Click="OnMenuSearchNote"/>
-              </MenuItem>
-              <MenuItem Header="{DynamicResource pianoroll.menu.batch}">
-                <MenuItem Header="{DynamicResource pianoroll.menu.notes}" ItemsSource="{Binding NoteBatchEdits}">
-                  <MenuItem.DataTemplates>
-                    <DataTemplate DataType="vm:MenuItemViewModel">
-                      <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
-                    </DataTemplate>
-                  </MenuItem.DataTemplates>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}">
-                  <MenuItem.DataTemplates>
+        <Border Width="24" Height="20"/>
+        <Border>
+          <StackPanel Orientation="Horizontal">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2" IsChecked="{Binding NotesViewModel.ShowTips}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tips}">
+              <Grid Width="18" Height="18">
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="?" FontWeight="Bold"
+                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.PlayTone}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tone}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M21,3V15.5A3.5,3.5 0 0,1 17.5,19A3.5,3.5 0 0,1 14,15.5A3.5,3.5 0 0,1 17.5,12C18.04,12 18.55,12.12 19,12.34V6.47L9,8.6V17.5A3.5,3.5 0 0,1 5.5,21A3.5,3.5 0 0,1 2,17.5A3.5,3.5 0 0,1 5.5,14C6.04,14 6.55,14.12 7,14.34V6L21,3Z" >
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowVibrato}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.vibrato}">
+              <Grid Width="18" Height="18">
+                <Path Classes="stroked" Data="M-6.5 1 L-6 1.5 L-4.5 0 L-2 2.5 L0.5 0 L3 2.5 L6.5 -1 L6 -1.5 L4.5 0 L2 -2.5 L-0.5 0 L-3 -2.5 Z">
+                  <Path.RenderTransform>
+                    <TranslateTransform X="9" Y="9"/>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPitch}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.pitch}">
+              <Grid Width="18" Height="18">
+                <Ellipse Classes="stroked" Height="4" Width="4" Margin="2,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
+                <Ellipse Classes="stroked" Height="4" Width="4" Margin="0,5,2,0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
+                <Path Classes="stroked" Data="M 6.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 11.5 6.5"/>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowFinalPitch}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.finalpitch}">
+              <Grid Width="18" Height="18">
+                <Path Classes="stroked" Data="M 5.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 12.5 6.5"/>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowWaveform}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.waveform}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M22 12L20 13L19 14L18 13L17 16L16 13L15 21L14 13L13 15L12 13L11 17L10 13L9 22L8 13L7 19L6 13L5 14L4 13L2 12L4 11L5 10L6 11L7 5L8 11L9 2L10 11L11 7L12 11L13 9L14 11L15 3L16 11L17 8L18 11L19 10L20 11L22 12Z">
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".67" ScaleY=".67" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPhoneme}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.phoneme}">
+              <Grid Width="18" Height="18">
+                <Path Classes="stroked" Data="M 3 13 L 6 5.5 L 12 5.5 L 15 13"/>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.noteparams}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z">
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".65" ScaleY=".65" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+            <ToggleButton Name="SnapToggle" Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.IsSnapOn}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.snap}">
+              <Border Width="18" Height="18">
+                <Path Classes="stroked" Data="M 4.5 13.5 L 7.5 13.5 L 7.5 9.5 A 1,1 0 1 1 10.5,9.5 L 10.5 13.5 L 13.5 13.5 L 13.5 8.5 A 1,1 0 1 0 4.5,8.5 Z"/>
+              </Border>
+            </ToggleButton>
+            <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton">
+              <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
+                         TextAlignment="Right" FontSize="10" FontFamily="monospace"
+                         Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+              <Button.ContextMenu>
+                <ContextMenu Name="SnapDivMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.SnapDivs}" KeyDown="OnSnapDivKeyDown">
+                  <ContextMenu.DataTemplates>
                     <DataTemplate DataType="vm:MenuItemViewModel">
                       <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
                     </DataTemplate>
-                  </MenuItem.DataTemplates>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu">
-                  <MenuItem.DataTemplates>
-                    <DataTemplate DataType="vm:MenuItemViewModel">
-                      <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}" Height="{Binding Height}"/>
-                    </DataTemplate>
-                  </MenuItem.DataTemplates>
-                </MenuItem>
-              </MenuItem>
-              <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" Click="OnMenuEditLyrics"/>
-              <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
-            </Menu>
-          </Border>
+                  </ContextMenu.DataTemplates>
+                </ContextMenu>
+              </Button.ContextMenu>
+            </Button>
+          </StackPanel>
         </Border>
       </StackPanel>
-      <StackPanel Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Bottom"
+      <StackPanel Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Bottom"
                   Margin="12,12,12,70" Orientation="Horizontal">
-        <Border CornerRadius="2" BoxShadow="0 0 5 1 #1F000000">
+        <Border>
           <c:SearchBar Name="SearchBar"/>
         </Border>
       </StackPanel>
-      <Rectangle Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+      <Rectangle Grid.Row="3" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
                  Margin="0,0,0,60" Height="6" Opacity="0.15" IsVisible="{Binding NotesViewModel.ShowPhoneme}">
         <Rectangle.Fill>
           <LinearGradientBrush StartPoint="0,0" EndPoint="0,6">
@@ -434,7 +412,7 @@
           </LinearGradientBrush>
         </Rectangle.Fill>
       </Rectangle>
-      <c:PhonemeCanvas Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="0" Height="60"
+      <c:PhonemeCanvas Grid.Row="3" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="0" Height="60"
                        Background="{DynamicResource BackgroundBrushSemi}"
                        TickWidth="{Binding NotesViewModel.TickWidth}"
                        TickOffset="{Binding NotesViewModel.TickOffset}"
@@ -443,12 +421,12 @@
                        PointerPressed="PhonemeCanvasPointerPressed"
                        PointerMoved="PhonemeCanvasPointerMoved"
                        PointerReleased="PhonemeCanvasPointerReleased"/>
-      <GridSplitter Grid.Row="3" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+      <GridSplitter Grid.Row="4" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="{DynamicResource SystemControlBackgroundAltHighBrush}" Focusable="False" Cursor="SizeNorthSouth"/>
-      <c:TrackBackground Grid.Row="4" Grid.Column="1" IsHitTestVisible="False"
+      <c:TrackBackground Grid.Row="5" Grid.Column="1" IsHitTestVisible="False"
                          Foreground="{DynamicResource TrackBackgroundAltBrush}"
                          TrackHeight="{Binding NotesViewModel.ExpTrackHeight}"/>
-      <c:TickBackground Grid.Row="4"  Grid.Column="1" IsHitTestVisible="False"
+      <c:TickBackground Grid.Row="5"  Grid.Column="1" IsHitTestVisible="False"
                         Foreground="{DynamicResource TickLineBrush}"
                         Background="{DynamicResource TickLineBrushLow}"
                         Resolution="{Binding PlaybackViewModel.Resolution}"
@@ -456,12 +434,12 @@
                         TickOrigin="{Binding NotesViewModel.TickOrigin}"
                         TickOffset="{Binding NotesViewModel.TickOffset}"
                         SnapDiv="{Binding NotesViewModel.SnapDiv, Mode=OneWay}"/>
-      <c:ExpressionCanvas Grid.Row="4" Grid.Column="1" Opacity="{Binding NotesViewModel.ExpShadowOpacity}"
+      <c:ExpressionCanvas Grid.Row="5" Grid.Column="1" Opacity="{Binding NotesViewModel.ExpShadowOpacity}"
                           TickWidth="{Binding NotesViewModel.TickWidth}"
                           TickOffset="{Binding NotesViewModel.TickOffset}"
                           Part="{Binding NotesViewModel.Part}"
                           Key="{Binding NotesViewModel.SecondaryKey}"/>
-      <c:ExpressionCanvas Grid.Row="4" Grid.Column="1"
+      <c:ExpressionCanvas Grid.Row="5" Grid.Column="1"
                           Bounds="{Binding NotesViewModel.ExpBounds, Mode=OneWayToSource}"
                           TickWidth="{Binding NotesViewModel.TickWidth}"
                           TickOffset="{Binding NotesViewModel.TickOffset}"
@@ -471,18 +449,18 @@
                           PointerMoved="ExpCanvasPointerMoved"
                           PointerReleased="ExpCanvasPointerReleased">
       </c:ExpressionCanvas>
-      <TextBlock Classes="tips" Grid.Row="4" Grid.Column="1"
+      <TextBlock Classes="tips" Grid.Row="5" Grid.Column="1"
                  IsHitTestVisible="False" VerticalAlignment="Bottom" Margin="10,5"
                  IsVisible="{Binding NotesViewModel.PrimaryKeyNotSupported}"
                  Text="{DynamicResource tip.exps.notsupported}"/>
-      <Border Grid.Column="3" Grid.RowSpan="5"
+      <Border Grid.Column="3" Grid.Row="1" Grid.RowSpan="5"
               IsEnabled="{Binding NotesViewModel.ShowNoteParams}"
               IsVisible="{Binding NotesViewModel.ShowNoteParams}"
               Background="{DynamicResource SystemRegionBrush}" Padding="0">
         <c:NotePropertiesControl/>
       </Border>
-      
-      <Border Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+
+      <Border Grid.Row="2" Grid.RowSpan="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
               BoxShadow="inset 0 0 5 1 #3F000000" ClipToBounds="True" IsHitTestVisible="False">
         <Grid>
           <Border Classes="tips" HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -504,13 +482,13 @@
           </Border>
         </Grid>
       </Border>
-      <Grid Grid.Row="2" Grid.Column="1" RowDefinitions="1*,1*">
+      <Grid Grid.Row="3" Grid.Column="1" RowDefinitions="1*,1*">
         <Border Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top"
                 BoxShadow="0 0 5 1 #3F000000">
           <c:LyricBox Name="LyricBox" Width="360"/>
         </Border>
       </Grid>
-      <Border Grid.Row="4" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+      <Border Grid.Row="5" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
               BoxShadow="inset 0 0 5 1 #3F000000" ClipToBounds="True" IsHitTestVisible="False">
         <Border Classes="tips" HorizontalAlignment="Center" VerticalAlignment="Center"
                 IsVisible="{Binding NotesViewModel.ShowTips}" BoxShadow="0 0 5 1 #3F000000">
@@ -518,20 +496,19 @@
                      Text="{DynamicResource tip.exps}"/>
         </Border>
       </Border>
-      <Border Grid.Row="1" Grid.Column="2" Background="Transparent"
+      <Border Grid.Row="2" Grid.Column="2" Background="Transparent"
               HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0" Height="24"
               PointerWheelChanged="ViewScalerPointerWheelChanged">
         <c:ViewScaler Name="VScaler" DataContext="{Binding NotesViewModel}" Value="{Binding TrackHeight}" Min="{Binding TrackHeightMin}" Max="{Binding TrackHeightMax}"/>
       </Border>
-      <Canvas Name="ValueTipCanvas" Grid.Column="1" Grid.Row="1" Grid.RowSpan="4" IsHitTestVisible="False">
+      <Canvas Name="ValueTipCanvas" Grid.Column="1" Grid.Row="2" Grid.RowSpan="4" IsHitTestVisible="False">
         <Border Name="ValueTip" BorderThickness="1"
                 BorderBrush="{DynamicResource NeutralAccentBrush}"
                 Background="{DynamicResource SystemControlBackgroundAltHighBrush}">
           <TextBlock Name="ValueTipText" Margin="2"/>
         </Border>
       </Canvas>
-      <ProgressBar Grid.Row="5" Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Value="{Binding Progress}"/>
+      <ProgressBar Grid.Row="6" Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Value="{Binding Progress}"/>
     </Grid>
-    </Border>
-  </Grid>
+  </Border>
 </Window>

From 6a9a8670fdc847d0a295a2276646863ba1a8158f Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Tue, 10 Oct 2023 14:36:45 +0800
Subject: [PATCH 4/4] add back

---
 OpenUtau/Views/PianoRollWindow.axaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OpenUtau/Views/PianoRollWindow.axaml b/OpenUtau/Views/PianoRollWindow.axaml
index a6c6f13e9..51d890a0b 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml
+++ b/OpenUtau/Views/PianoRollWindow.axaml
@@ -394,6 +394,20 @@
                 </ContextMenu>
               </Button.ContextMenu>
             </Button>
+            <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton">
+                <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
+                           TextAlignment="Right" FontSize="10" FontFamily="monospace"
+                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+                <Button.ContextMenu>
+                  <ContextMenu Name="KeyMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.Keys}" KeyDown="OnKeyKeyDown">
+                    <ContextMenu.DataTemplates>
+                      <DataTemplate DataType="vm:MenuItemViewModel">
+                        <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
+                      </DataTemplate>
+                    </ContextMenu.DataTemplates>
+                  </ContextMenu>
+                </Button.ContextMenu>
+              </Button>
           </StackPanel>
         </Border>
       </StackPanel>