Merge pull request #19358 from miiizen/16426-timesig-skyline

Add time signatures to skyline
musescore · Sep 11, 2023 · 6a4f730 · 6a4f730
2 parents 22531d1 + 0c857d9
commit 6a4f730
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/engraving/rendering/dev/systemlayout.cpp b/src/engraving/rendering/dev/systemlayout.cpp
@@ -49,6 +49,7 @@
 #include "dom/stafflines.h"
 #include "dom/system.h"
 #include "dom/tie.h"
+#include "dom/timesig.h"
 #include "dom/tremolo.h"
 #include "dom/tuplet.h"
 #include "dom/volta.h"
@@ -780,7 +781,7 @@ void SystemLayout::layoutSystemElements(System* system, LayoutContext& ctx)
                 ss->skyline().add(m->staffLines(staffIdx)->layoutData()->bbox().translated(m->pos()));
             }
             for (Segment& s : m->segments()) {
-                if (!s.enabled() || s.isTimeSigType()) {             // hack: ignore time signatures
+                if (!s.enabled()) {
                     continue;
                 }
                 PointF p(s.pos() + m->pos());
@@ -791,6 +792,11 @@ void SystemLayout::layoutSystemElements(System* system, LayoutContext& ctx)
                         RectF r = TLayout::layoutRect(bl, ctx);
                         skyline.add(r.translated(bl->pos() + p));
                     }
+                } else if (s.segmentType() & SegmentType::TimeSig) {
+                    TimeSig* ts = toTimeSig(s.element(staffIdx * VOICES));
+                    if (ts && ts->addToSkyline()) {
+                        skyline.add(ts->shape().translate(ts->pos() + p));
+                    }
                 } else {
                     track_idx_t strack = staffIdx * VOICES;
                     track_idx_t etrack = strack + VOICES;

diff --git a/vtest/scores/timesig-1.mscz b/vtest/scores/timesig-1.mscz