Fix musescore#17891: Instrument names follow largest stave spatium in…

… part
miiizen · Aug 24, 2023 · f0ba9cc · f0ba9cc
1 parent 2abc6c2
commit f0ba9cc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/engraving/libmscore/engravingitem.h b/src/engraving/libmscore/engravingitem.h
@@ -170,7 +170,7 @@ class EngravingItem : public EngravingObject
 
     virtual bool isEngravingItem() const override { return true; }
 
-    double spatium() const;
+    virtual double spatium() const;
 
     inline void setFlag(ElementFlag f, bool v)
     {

diff --git a/src/engraving/libmscore/instrumentname.cpp b/src/engraving/libmscore/instrumentname.cpp
@@ -23,6 +23,9 @@
 #include "instrumentname.h"
 
 #include "measure.h"
+#include "part.h"
+#include "staff.h"
+#include "style/style.h"
 #include "system.h"
 
 #include "log.h"
@@ -80,6 +83,28 @@ void InstrumentName::setInstrumentNameType(const String& s)
     }
 }
 
+double InstrumentName::spatium() const
+{
+    if (systemFlag() || (explicitParent() && parentItem()->systemFlag())) {
+        return style().spatium();
+    }
+
+    // Get spatium for instrument names from largest staff of part,
+    // instead of staff it is attached to
+    Part* p = part();
+    if (!part()) {
+        return style().spatium();
+    }
+    double largestSpatium = 0;
+    for (Staff* s: p->staves()) {
+        double sp = s->spatium(tick());
+        if (sp > largestSpatium) {
+            largestSpatium = sp;
+        }
+    }
+    return largestSpatium;
+}
+
 //---------------------------------------------------------
 //   setInstrumentNameType
 //---------------------------------------------------------

diff --git a/src/engraving/libmscore/instrumentname.h b/src/engraving/libmscore/instrumentname.h
@@ -64,6 +64,8 @@ class InstrumentName final : public TextBase
     SysStaff* sysStaff() const { return _sysStaff; }
     void setSysStaff(SysStaff* s) { _sysStaff = s; }
 
+    double spatium() const override;
+
     Fraction playTick() const override;
     bool isEditable() const override { return false; }
     PropertyValue getProperty(Pid propertyId) const override;

diff --git a/vtest/scores/instrument-names.mscz b/vtest/scores/instrument-names.mscz