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

…e on a system if there is a key change Backport of musescore#18530
Jojo-Schmitz · Oct 15, 2023 · ad92e57 · ad92e57
1 parent 47766fe
commit ad92e57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/libmscore/keysig.cpp b/libmscore/keysig.cpp
@@ -557,6 +557,14 @@ 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/libmscore/keysig.h b/libmscore/keysig.h
@@ -58,6 +58,7 @@ class KeySig final : public Element {
       bool isCustom() const               { return _sig.custom(); }
       bool isAtonal() const               { return _sig.isAtonal(); }
       bool isChange() const;
+      bool isFirstSystemKeySig();
       KeySigEvent keySigEvent() const     { return _sig; }
       bool operator==(const KeySig&) const;
       void changeKeySigEvent(const KeySigEvent&);

diff --git a/libmscore/transpose.cpp b/libmscore/transpose.cpp
@@ -434,7 +434,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->isCustom() && !ks->isAtonal()) {
                               Staff* staff = ks->staff();