Align left to left of note, centre to centre etc.

Change tooltips in inspector

Refine align and position buttons in edit style

Fix button spacing

Add vtest

Migrate old scores

Refactor `positionRelativeToNoteheadRest`

Author: miiizen

src/engraving/compat/engravingcompat.cpp

@@ -41,6 +41,10 @@ void EngravingCompat::doPreLayoutCompatIfNeeded(MasterScore* score)
 {
     int mscVersion = score->mscVersion();
 
+    if (mscVersion < 470) {
+        adjustTextOffset(score);
+    }
+
     if (mscVersion < 460) {
         resetMarkerLeftFontSize(score);
         resetRestVerticalOffsets(score);
@@ -233,6 +237,39 @@ void EngravingCompat::adjustVBoxDistances(MasterScore* masterScore)
     }
 }
 
+void EngravingCompat::adjustTextOffset(MasterScore* masterScore)
+{
+    auto doAdjustTextOffset = [](EngravingItem* item) {
+        if (!item->isTextBase()) {
+            return;
+        }
+
+        TextBase* text = toTextBase(item);
+
+        // Staff text, system text, and harp pedal diagrams are the only types which are attached to notes and weren't already
+        // placed with their left edges / centres / right edges aligned to the left / centre / right of the notehead
+        if (text->positionRelativeToNoteheadRest() && (text->isStaffText() || text->isSystemText() || text->isHarpPedalDiagram())) {
+            double mag = item->staff() ? item->staff()->staffMag(item) : 1.0;
+            double xAdj = item->symWidth(SymId::noteheadBlack) * mag;
+
+            switch (text->position()) {
+            case AlignH::HCENTER:
+                text->setProperty(Pid::OFFSET, PointF(text->offset().x() - xAdj / 2, text->offset().y()));
+                break;
+            case AlignH::RIGHT:
+                text->setProperty(Pid::OFFSET, PointF(text->offset().x() - xAdj, text->offset().y()));
+                break;
+            default:
+                break;
+            }
+        }
+    };
+
+    for (Score* score : masterScore->scoreList()) {
+        score->scanElements(doAdjustTextOffset);
+    }
+}
+
 void EngravingCompat::doPostLayoutCompatIfNeeded(MasterScore* score)
 {
     bool needRelayout = false;

src/engraving/compat/engravingcompat.h

@@ -40,6 +40,7 @@ class EngravingCompat
     static void resetMarkerLeftFontSize(MasterScore* masterScore);
     static void resetRestVerticalOffsets(MasterScore* masterScore);
     static void adjustVBoxDistances(MasterScore* masterScore);
+    static void adjustTextOffset(MasterScore* masterScore);
 
     static bool relayoutUserModifiedCrossStaffBeams(MasterScore* score);
     static bool resetHookHeightSign(MasterScore* masterScore);

src/engraving/dom/dynamic.h

@@ -120,6 +120,8 @@ class Dynamic final : public TextBase
 
     bool isEditAllowed(EditData&) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     Hairpin* leftHairpin() const { return m_leftHairpin; }
     Hairpin* rightHairpin() const { return m_rightHairpin; }
 

src/engraving/dom/expression.h

@@ -59,5 +59,7 @@ class Expression final : public TextBase
     bool hasVoiceAssignmentProperties() const override { return true; }
 
     void reset() override;
+
+    bool positionRelativeToNoteheadRest() const override { return true; }
 };
 }

src/engraving/dom/figuredbass.h

@@ -291,6 +291,8 @@ class FiguredBass final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     size_t itemsCount() const { return m_items.size(); }
     void appendItem(FiguredBassItem* item) { m_items.push_back(item); }
     const std::vector<FiguredBassItem*>& items() const { return m_items; }

src/engraving/dom/fingering.h

@@ -56,6 +56,8 @@ class Fingering final : public TextBase
     String accessibleInfo() const override;
 
     bool isOnCrossBeamSide() const;
+
+    bool positionRelativeToNoteheadRest() const override { return false; }
 };
 } // namespace mu::engraving
 #endif

src/engraving/dom/guitarbend.h

@@ -266,5 +266,7 @@ class GuitarBendText final : public TextBase
     GuitarBendText* clone() const override { return new GuitarBendText(*this); }
 
     bool isEditable() const override { return false; }
+
+    bool positionRelativeToNoteheadRest() const override { return false; }
 };
 }

src/engraving/dom/hammeronpulloff.h

@@ -54,6 +54,8 @@ class HammerOnPullOffText final : public TextBase
 
     PropertyValue propertyDefault(Pid id) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
     Chord* m_startChord = nullptr;
     Chord* m_endChord = nullptr;

src/engraving/dom/harmony.cpp

@@ -1615,6 +1615,11 @@ PropertyValue Harmony::propertyDefault(Pid id) const
     return v;
 }
 
+bool Harmony::positionRelativeToNoteheadRest() const
+{
+    return !parent()->isFretDiagram();
+}
+
 //---------------------------------------------------------
 //   getPropertyStyle
 //---------------------------------------------------------

src/engraving/dom/harmony.h

@@ -289,6 +289,8 @@ class Harmony final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue& v) override;
     PropertyValue propertyDefault(Pid id) const override;
 
+    bool positionRelativeToNoteheadRest() const override;
+
     double mag() const override;
 
     double bassScale() const { return m_bassScale; }