Merge pull request #1220 from oxygen-dioxide/textbox-undo

Fix several bugs on pressing Ctrl+Z in TextBoxes
stakira · Jul 24, 2024 · 2ffaa92 · 2ffaa92
2 parents 4e89df7 + 24fe572
commit 2ffaa92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/OpenUtau.Core/Util/SplitLyrics.cs b/OpenUtau.Core/Util/SplitLyrics.cs
@@ -11,7 +11,10 @@ public static class SplitLyrics {
             @"\p{IsCJKUnifiedIdeographs}|\p{IsHiragana}|\p{IsKatakana}|\p{IsHangulSyllables}");
         static Regex contracted = new Regex(@"[ゃゅょぁぃぅぇぉャュョァィゥェォ]");
 
-        public static List<string> Split(string text) {
+        public static List<string> Split(string? text) {
+            if(text == null){
+                return new List<string>();
+            }
             var lyrics = new List<string>();
             var builder = new StringBuilder();
             var etor = StringInfo.GetTextElementEnumerator(text);

diff --git a/OpenUtau/ViewModels/LyricsViewModel.cs b/OpenUtau/ViewModels/LyricsViewModel.cs
@@ -11,7 +11,7 @@
 
 namespace OpenUtau.App.ViewModels {
     class LyricsViewModel : ViewModelBase {
-        [Reactive] public string Text { get; set; }
+        [Reactive] public string? Text { get; set; }
         [Reactive] public int CurrentCount { get; set; }
         [Reactive] public int TotalCount { get; set; }
         [Reactive] public int MaxCount { get; set; }

diff --git a/OpenUtau/ViewModels/NoteDefaultsViewModel.cs b/OpenUtau/ViewModels/NoteDefaultsViewModel.cs
@@ -9,7 +9,7 @@
 namespace OpenUtau.App.ViewModels {
     class NoteDefaultsViewModel : ViewModelBase {
 
-        [Reactive] public string DefaultLyric { get; set; }
+        [Reactive] public string? DefaultLyric { get; set; }
         [Reactive] public int CurrentPortamentoLength { get; set; }
         [Reactive] public int CurrentPortamentoStart { get; set; }
         [Reactive] public float CurrentVibratoLength { get; set; }
@@ -57,6 +57,9 @@ public NoteDefaultsViewModel() {
 
             this.WhenAnyValue(vm => vm.DefaultLyric)
                     .Subscribe(defaultLyric => {
+                        if(defaultLyric == null){
+                            return;
+                        }
                         NotePresets.Default.DefaultLyric = defaultLyric;
                         NotePresets.Save();
                     });

diff --git a/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs b/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs
@@ -21,7 +21,7 @@ public G2pOption(Type klass) {
         public List<G2pOption> G2ps => g2ps;
 
         [Reactive] public G2pOption? G2p { get; set; }
-        [Reactive] public string Grapheme { get; set; }
+        [Reactive] public string? Grapheme { get; set; }
         [Reactive] public string Phonemes { get; set; }
 
         private readonly List<G2pOption> g2ps = new List<G2pOption>() {
@@ -57,7 +57,7 @@ public PhoneticAssistantViewModel() {
         }
 
         private void Refresh() {
-            if (g2p == null) {
+            if (Grapheme == null || g2p == null) {
                 Phonemes = string.Empty;
                 return;
             }