GH#16426: Add time signatures to skyline

Backport of musescore#19358
Jojo-Schmitz · Sep 11, 2023 · 449ce4d · 449ce4d
1 parent 9c7e932
commit 449ce4d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -4292,7 +4292,7 @@ void Score::layoutSystemElements(System* system, LayoutContext& lc)
                   if (m->staffLines(staffIdx)->addToSkyline())
                         ss->skyline().add(m->staffLines(staffIdx)->bbox().translated(m->pos()));
                   for (Segment& s : m->segments()) {
-                        if (!s.enabled() || s.isTimeSigType())       // hack: ignore time signatures
+                        if (!s.enabled())
                               continue;
                         QPointF p(s.pos() + m->pos());
                         if (s.segmentType() & (SegmentType::BarLine | SegmentType::EndBarLine | SegmentType::StartRepeatBarLine | SegmentType::BeginBarLine)) {
@@ -4302,6 +4302,12 @@ void Score::layoutSystemElements(System* system, LayoutContext& lc)
                                     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().translated(ts->pos() + p));
+                                    }
+                              }
                         else {
                               int strack = staffIdx * VOICES;
                               int etrack = strack + VOICES;

diff --git a/vtest/gen b/vtest/gen
@@ -82,7 +82,7 @@ else
        layout-sequence-9 layout-sequence-10 layout-sequence-11 layout-sequence-12\
        layout-sequence-13 layout-sequence-14 layout-sequence-15 layout-sequence-16\
        measure-number-1 measure-number-2 measure-number-3 measure-number-4 measure-number-5\
-       custom-keysig-1 custom-keysig-2 custom-keysig-3 custom-keysig-4"
+       custom-keysig-1 custom-keysig-2 custom-keysig-3 custom-keysig-4 timesig-1"
 fi
 
 #####DEBUG: failed tests

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -57,7 +57,7 @@ set SRC=bravura-mmrest,gonville-mmrest, ^
  layout-sequence-9, layout-sequence-10, layout-sequence-11, layout-sequence-12, ^
  layout-sequence-13, layout-sequence-14, layout-sequence-15, layout-sequence-16, ^
  measure-number-1, measure-number-2, measure-number-3, measure-number-4, measure-number-5 ^
- custom-keysig-1, custom-keysig-2, custom-keysig-2, custom-keysig-3
+ custom-keysig-1, custom-keysig-2, custom-keysig-2, custom-keysig-3, timesig-1
 
 IF NOT "%1"=="" (
    SET INSTALL_PATH=%1

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