Merge pull request #25422 from krasko78/25413-TextWontMoveAfterEdit

25413: Text won't move after edit
musescore · Nov 4, 2024 · a5e8746 · a5e8746
2 parents 1144135 + 2e2619b
commit a5e8746
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/notation/internal/notationinteraction.cpp b/src/notation/internal/notationinteraction.cpp
@@ -3392,14 +3392,13 @@ void NotationInteraction::endEditText()
         return;
     }
 
-    doEndEditElement(false /*clearEditData*/);
+    EngravingItem* editedElement = m_editData.element;
+    doEndEditElement();
 
-    if (m_editData.element) {
-        notifyAboutTextEditingEnded(toTextBase(m_editData.element));
+    if (editedElement) {
+        notifyAboutTextEditingEnded(toTextBase(editedElement));
     }
 
-    m_editData.clear();
-
     notifyAboutTextEditingChanged();
     notifyAboutSelectionChangedIfNeed();
 }
@@ -3754,15 +3753,12 @@ void NotationInteraction::endEditElement()
     notifyAboutNotationChanged();
 }
 
-void NotationInteraction::doEndEditElement(bool clearEditData)
+void NotationInteraction::doEndEditElement()
 {
     if (m_editData.element) {
         m_editData.element->endEdit(m_editData);
     }
-
-    if (clearEditData) {
-        m_editData.clear();
-    }
+    m_editData.clear();
 }
 
 void NotationInteraction::onElementDestroyed(EngravingItem* element)

diff --git a/src/notation/internal/notationinteraction.h b/src/notation/internal/notationinteraction.h
@@ -310,7 +310,7 @@ class NotationInteraction : public INotationInteraction, public muse::Injectable
     bool needStartEditGrip(QKeyEvent* event) const;
     bool handleKeyPress(QKeyEvent* event);
 
-    void doEndEditElement(bool clearEditData = true);
+    void doEndEditElement();
     void doEndDrag();
 
     bool doDropStandard();