Changes to custom text behaviour

Author: miiizen

src/engraving/dom/barline.cpp

@@ -956,8 +956,10 @@ PropertyValue BarLine::propertyDefault(Pid propertyId) const
     case Pid::PLAY_COUNT_TEXT_SETTING:
         return AutoCustomHide::AUTO;
 
-    case Pid::PLAY_COUNT_TEXT:
-        return String();
+    case Pid::PLAY_COUNT_TEXT: {
+        double repeatCount = measure() ? measure()->repeatCount() : 2;
+        return TConv::translatedUserName(style().styleV(Sid::repeatPlayCountPreset).value<RepeatPlayCountPreset>()).arg(repeatCount);
+    }
 
     default:
         break;

src/engraving/dom/edit.cpp

@@ -5526,7 +5526,8 @@ void Score::undoResetPlayCountTextSettings(BarLine* bl)
             continue;
         }
 
-        curBl->undoChangeProperty(Pid::PLAY_COUNT_TEXT_SETTING, AutoCustomHide::AUTO);
+        curBl->undoResetProperty(Pid::PLAY_COUNT_TEXT_SETTING);
+        curBl->undoResetProperty(Pid::PLAY_COUNT_TEXT);
     }
 }
 

src/engraving/dom/playcounttext.cpp

@@ -24,6 +24,8 @@
 
 #include "barline.h"
 #include "dom/score.h"
+#include "dom/textedit.h"
+#include "dom/undo.h"
 
 using namespace mu;
 using namespace mu::engraving;
@@ -39,19 +41,18 @@ PlayCountText::PlayCountText(BarLine* parent, TextStyleType tid)
     initElementStyle(&playCountStyle);
 }
 
-void PlayCountText::startEdit(EditData& ed)
-{
-    score()->startCmd(TranslatableString("undoableAction", "Set play count text setting to custom"));
-    barline()->undoChangeProperty(Pid::PLAY_COUNT_TEXT_SETTING, AutoCustomHide::CUSTOM);
-    score()->endCmd();
-    TextBase::startEdit(ed);
-}
-
 void PlayCountText::endEdit(EditData& ed)
 {
-    score()->startCmd(TranslatableString("undoableAction", "Update play count text"));
-    barline()->undoChangeProperty(Pid::PLAY_COUNT_TEXT, xmlText());
-    score()->endCmd();
+    UndoStack* undo = score()->undoStack();
+    TextEditData* ted = static_cast<TextEditData*>(ed.getData(this).get());
+    const bool textWasEdited = undo->currentIndex() > ted->startUndoIdx;
+
+    if (textWasEdited) {
+        score()->startCmd(TranslatableString("undoableAction", "Update play count text"));
+        barline()->undoChangeProperty(Pid::PLAY_COUNT_TEXT, xmlText());
+        barline()->undoChangeProperty(Pid::PLAY_COUNT_TEXT_SETTING, AutoCustomHide::CUSTOM);
+        score()->endCmd();
+    }
     TextBase::endEdit(ed);
 }
 

src/engraving/dom/playcounttext.h

@@ -36,7 +36,6 @@ class PlayCountText final : public TextBase
     BarLine* barline() const { return toBarLine(parent()); }
 
     bool isEditable() const override { return true; }
-    void startEdit(EditData&) override;
     void endEdit(EditData&) override;
 
     EngravingItem* propertyDelegate(Pid) override;