fix musescore#21458: Bar rests not presented correctly at line break …

…before key and time signature change
chenlung · Nov 22, 2013 · d5e8e5f · d5e8e5f
1 parent a15c59f
commit d5e8e5f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3322,6 +3322,14 @@ void Measure::layoutX(qreal stretch)
                                                 x1 = qMax(x1, ss->x() + e->x() + e->width());
                                           }
                                     }
+
+                              Segment* ns = s->next();
+                              while (ns && ns->segmentType() != Segment::SegEndBarLine) {
+                                    ns = ns->next();
+                                    }
+                              if (ns)
+                                    x2 = ns->x();
+
                               rest->rxpos() = (x2 - x1 - e->width()) * .5 + x1 - s->x();
                               rest->adjustReadPos();
                               }

diff --git a/vtest/fmrest-6-ref.png b/vtest/fmrest-6-ref.png
diff --git a/vtest/fmrest-6.mscz b/vtest/fmrest-6.mscz
diff --git a/vtest/gen b/vtest/gen
@@ -4,7 +4,7 @@
 # "compare" - image magick compare program
 #
 SRC="mmrest-1 bravura-mmrest mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
- fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 measure-repeat-1 \
+ fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1 \
  noteheadposition-1 valign-1 emmentaler-1 bravura-1 emmentaler-2 bravura-2\
  emmentaler-3 bravura-3 emmentaler-4 bravura-4 emmentaler-5 bravura-5\
  emmentaler-6 bravura-6 emmentaler-7 bravura-7\

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -3,10 +3,12 @@
 #
 # "compare" - image magick compare program
 #
-set SRC=mmrest-1,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9, ^
- fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,measure-repeat-1, ^
+set SRC=mmrest-1,bravura-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9, ^
+ fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^
  noteheadposition-1,valign-1,emmentaler-1,bravura-1,emmentaler-2,bravura-2, ^
- emmentaler-3,bravura-3,emmentaler-5,bravura-5
+ emmentaler-3,bravura-3,emmentaler-4,bravura-4,emmentaler-5,bravura-5, ^
+ emmentaler-6,bravura-6,emmentaler-7,bravura-7, ^
+ emmentaler-8,bravura-8,emmentaler-9,bravura-9
 
 set MSCORE=..\win32install\bin\mscore.exe
 set DPI=130