Merge branch 'stakira:master' into Fix-key-scale

stakira · Nov 14, 2024 · daa93cd · daa93cd
2 parents 21af091 + 45f3604
commit daa93cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OpenUtau/Controls/LyricBox.axaml.cs b/OpenUtau/Controls/LyricBox.axaml.cs
@@ -135,8 +135,8 @@ private void OnTab(KeyModifiers keyModifiers) {
         }
 
         public void ListBox_PointerPressed(object sender, PointerPressedEventArgs args) {
-            if (sender is Grid grid &&
-                grid.DataContext is LyricBoxViewModel.SuggestionItem item) {
+            if (sender is DockPanel panel &&
+                panel.DataContext is LyricBoxViewModel.SuggestionItem item) {
                 box.Text = item.Alias;
             }
             EndEdit(true);

diff --git a/OpenUtau/Views/NoteEditStates.cs b/OpenUtau/Views/NoteEditStates.cs
@@ -649,12 +649,12 @@ public override void Update(IPointer pointer, Point point, PointerEventArgs args
             }
             bool shiftHeld = args.KeyModifiers == KeyModifiers.Shift;
             bool ctrlShiftHeld = args.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift);
-            bool typeOptions = descriptor.type == UExpressionType.Options;
-            if (typeOptions) {
+            if (descriptor.type != UExpressionType.Curve) {
                 UpdatePhonemeExp(pointer, point, shiftHeld);
             } else {
                 UpdateCurveExp(pointer, point, ctrlShiftHeld, shiftHeld);
             }
+            bool typeOptions = descriptor.type == UExpressionType.Options;
             double viewMax = descriptor.max + (typeOptions ? 1 : 0);
             double displayValue;
             if (shiftHeld) {