code review changes

codecruisedor · Jul 5, 2023 · c7c90e0 · c7c90e0
1 parent d8bdda7
commit c7c90e0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/src/engraving/libmscore/lyrics.cpp b/src/engraving/libmscore/lyrics.cpp
@@ -313,13 +313,37 @@ bool Lyrics::isEditAllowed(EditData& ed) const
     return TextBase::isEditAllowed(ed);
 }
 
+void Lyrics::adjustPrevious()
+{
+    Lyrics* prev = prevLyrics(toLyrics(this));
+    if (prev) {
+        // search for lyric spanners to split at this point if necessary
+        if (prev->tick() + prev->ticks() >= tick()) {
+            // the previous lyric has a spanner attached that goes through this one
+            // we need to shorten it
+            Segment* s = score()->tick2segment(tick());
+            if (s) {
+                s = s->prev1(SegmentType::ChordRest);
+                if (s->tick() > prev->tick()) {
+                    prev->undoChangeProperty(Pid::LYRIC_TICKS, s->tick() - prev->tick());
+                } else {
+                    prev->undoChangeProperty(Pid::LYRIC_TICKS, Fraction::fromTicks(1));
+                }
+            }
+        }
+        prev->setRemoveInvalidSegments();
+        prev->triggerLayout();
+    }
+}
+
 //---------------------------------------------------------
 //   endEdit
 //---------------------------------------------------------
 
 void Lyrics::endEdit(EditData& ed)
 {
     TextBase::endEdit(ed);
+
     triggerLayoutAll();
 }
 

diff --git a/src/engraving/libmscore/lyrics.h b/src/engraving/libmscore/lyrics.h
@@ -88,6 +88,7 @@ class Lyrics final : public TextBase
     Fraction endTick() const;
     void removeFromScore();
     void setRemoveInvalidSegments() { _removeInvalidSegments = true; }
+    void adjustPrevious();
 
     using EngravingObject::undoChangeProperty;
     void paste(EditData& ed, const String& txt) override;

diff --git a/src/engraving/libmscore/textedit.cpp b/src/engraving/libmscore/textedit.cpp
@@ -223,24 +223,9 @@ void TextBase::endEdit(EditData& ed)
         triggerLayout();
     }
     if (isLyrics()) {
-        Lyrics* prev = prevLyrics(toLyrics(this));
-        if (prev) {
-            if (prev->tick() + prev->ticks() >= tick()) {
-                // the previous lyric has a spanner attached that goes through this one
-                // we need to shorten it
-                Segment* s = score()->tick2segment(tick());
-                if (s) {
-                    s = s->prev1(SegmentType::ChordRest);
-                    if (s->tick() > prev->tick()) {
-                        prev->undoChangeProperty(Pid::LYRIC_TICKS, s->tick() - prev->tick());
-                    } else {
-                        prev->undoChangeProperty(Pid::LYRIC_TICKS, Fraction::fromTicks(1));
-                    }
-                }
-            }
-            prev->setRemoveInvalidSegments();
-            prev->triggerLayout();
-        }
+        // we must adjust previous lyrics before the call to commitText(), in order to make the adjustments
+        // part of the same undo command. there is logic above that will skip this call if the text is empty
+        toLyrics(this)->adjustPrevious();
     }
 
     static const double w = 2.0;