Merge pull request #1559 from andy840119/implement-lyric-property-wri…

…table-version-bindable Add the `LyricPropertyWritableVersion` property in the lyric.
karaoke-dev · Sep 4, 2022 · ef11731 · ef11731
2 parents edd4d12 + 67dd4f2
commit ef11731
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs
@@ -259,5 +259,33 @@ public void TestConfigChange()
         }
 
         #endregion
+
+        #region MyRegion
+
+        [Test]
+        public void TestLyricPropertyWritableVersion()
+        {
+            var lyric = new Lyric();
+            Assert.AreEqual(0, lyric.LyricPropertyWritableVersion.Value);
+
+            lyric.Lock = LockState.Partial;
+            Assert.AreEqual(1, lyric.LyricPropertyWritableVersion.Value);
+
+            lyric.ReferenceLyric = new Lyric();
+            Assert.AreEqual(2, lyric.LyricPropertyWritableVersion.Value);
+
+            lyric.ReferenceLyricConfig = new SyncLyricConfig();
+            Assert.AreEqual(3, lyric.LyricPropertyWritableVersion.Value);
+
+            (lyric.ReferenceLyricConfig as SyncLyricConfig)!.OffsetTime = 200;
+            Assert.AreEqual(4, lyric.LyricPropertyWritableVersion.Value);
+
+            // version number will not increase if change not related property or assign the same value.
+            lyric.Lock = LockState.Partial;
+            lyric.Text = "karaoke";
+            Assert.AreEqual(4, lyric.LyricPropertyWritableVersion.Value);
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs
@@ -228,6 +228,9 @@ public IReferenceLyricPropertyConfig? ReferenceLyricConfig
             set => ReferenceLyricConfigBindable.Value = value;
         }
 
+        [JsonIgnore]
+        public readonly Bindable<int> LyricPropertyWritableVersion = new();
+
         public Lyric()
         {
             initInternalBindingEvent();

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs
@@ -72,6 +72,11 @@ private void initInternalBindingEvent()
                 void invalidate() => RomajiTagsVersion.Value++;
             };
 
+            LockBindable.ValueChanged += e =>
+            {
+                LyricPropertyWritableVersion.Value++;
+            };
+
             ReferenceLyricConfigBindable.ValueChanged += e =>
             {
                 if (e.OldValue != null)
@@ -102,6 +107,8 @@ private void initReferenceLyricEvent()
 
             ReferenceLyricBindable.ValueChanged += e =>
             {
+                LyricPropertyWritableVersion.Value++;
+
                 // text.
                 bindValueChange(e, l => l.TextBindable, (lyric, config) =>
                 {