Fix #18404: Transpose tool will only transpose initial key signature …

…on a system if there is a key change
musescore · Oct 17, 2023 · 3a56014 · 3a56014
1 parent 7091ae6
commit 3a56014
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/engraving/dom/keysig.cpp b/src/engraving/dom/keysig.cpp
@@ -27,6 +27,7 @@
 #include "masterscore.h"
 #include "score.h"
 #include "segment.h"
+#include "system.h"
 #include "staff.h"
 #include "part.h"
 
@@ -156,6 +157,15 @@ bool KeySig::isChange() const
     return staff()->currentKeyTick(keyTick) == keyTick;
 }
 
+bool KeySig::isFirstSystemKeySig()
+{
+    System* sys = measure()->system();
+    if (!sys) {
+        return false;
+    }
+    return tick().ticks() == sys->firstMeasure()->tick().ticks();
+}
+
 //---------------------------------------------------------
 //   changeKeySigEvent
 //---------------------------------------------------------

diff --git a/src/engraving/dom/keysig.h b/src/engraving/dom/keysig.h
@@ -69,6 +69,7 @@ class KeySig final : public EngravingItem
     bool isAtonal() const { return m_sig.isAtonal(); }
     bool isChange() const;
     const KeySigEvent& keySigEvent() const { return m_sig; }
+    bool isFirstSystemKeySig();
     bool operator==(const KeySig&) const;
     void changeKeySigEvent(const KeySigEvent&);
     void setKeySigEvent(const KeySigEvent& e) { m_sig = e; }

diff --git a/src/engraving/dom/transpose.cpp b/src/engraving/dom/transpose.cpp
@@ -489,7 +489,7 @@ bool Score::transpose(TransposeMode mode, TransposeDirection direction, Key trKe
             } else if (e->isKeySig() && trKeys && mode != TransposeMode::DIATONICALLY) {
                 KeySig* ks = toKeySig(e);
                 Fraction tick = segment->tick();
-                bool startKey = tick == s1->tick();
+                bool startKey = tick == s1->tick() && !ks->isFirstSystemKeySig();
                 bool addKey = ks->isChange();
                 if ((startKey || addKey) && !ks->isAtonal()) {
                     Staff* staff = ks->staff();