Merge pull request #30145 from mike-spa/fixInvisibleClefBug

Ensure header clef and key sig segment are always marked as header

Author: miiizen

src/engraving/dom/excerpt.cpp

@@ -1514,10 +1514,6 @@ void Excerpt::cloneStaff2(Staff* srcStaff, Staff* dstStaff, const Fraction& star
             TupletMap tupletMap;          // tuplets cannot cross measure boundaries
             track_idx_t dstTrack = map.at(srcTrack);
             for (Segment* oseg = m->first(); oseg; oseg = oseg->next()) {
-                if (oseg->header()) {
-                    // Generated at layout time, should not be cloned
-                    continue;
-                }
                 Segment* ns = nm->getSegment(oseg->segmentType(), oseg->tick());
                 EngravingItem* oef = oseg->element(trackZeroVoice(srcTrack));
                 if (oef && !oef->generated() && (oef->isTimeSig() || oef->isKeySig())) {

src/engraving/rendering/score/measurelayout.cpp

@@ -2532,9 +2532,9 @@ Segment* MeasureLayout::addHeaderClef(Measure* m, bool isFirstClef, const Staff*
     if (staff->staffTypeForElement(m)->genClef() && (isFirstClef || !hideClef)) {
         if (!cSegment) {
             cSegment = Factory::createSegment(m, SegmentType::HeaderClef, Fraction(0, 1));
-            cSegment->setHeader(true);
             m->add(cSegment);
         }
+        cSegment->setHeader(true);
         if (!clef) {
             //
             // create missing clef
@@ -2602,9 +2602,9 @@ Segment* MeasureLayout::addHeaderKeySig(Measure* m, bool isFirstKeysig, const St
     if ((isFirstKeysig || ctx.conf().styleB(Sid::genKeysig)) && isPitchedStaff) {
         if (!kSegment) {
             kSegment = Factory::createSegment(m, SegmentType::KeySig, Fraction(0, 1));
-            kSegment->setHeader(true);
             m->add(kSegment);
         }
+        kSegment->setHeader(true);
         if (!keysig) {
             //
             // create missing key signature
@@ -2727,14 +2727,16 @@ void MeasureLayout::removeSystemHeader(Measure* m)
                     break;
                 }
             }
-            if (!keySigChangeHappensHere || seg->header()) {
+            if (seg->header() && !keySigChangeHappensHere) {
                 seg->setEnabled(false);
             }
         }
         if (!seg->header()) {
             break;
         }
-        seg->setEnabled(false);
+        if (!seg->isKeySigType()) {
+            seg->setEnabled(false);
+        }
     }
     m->setHeader(false);
 }