File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -2135,7 +2135,7 @@ void Score::layoutLinear()
2135
2135
qreal xo = 0 ;
2136
2136
2137
2137
Measure* fm = firstMeasure ();
2138
- for (MeasureBase* m = first (); m != fm ; m = m->next ()) {
2138
+ for (MeasureBase* m = first (); m != fm ; m = m->next ()) {
2139
2139
if (m->type () == Element::HBOX)
2140
2140
xo += point (static_cast <Box*>(m)->boxWidth ());
2141
2141
}
@@ -2152,17 +2152,22 @@ void Score::layoutLinear()
2152
2152
curMeasure = curMeasure->next ();
2153
2153
continue ;
2154
2154
}
2155
+ if (styleB (ST_createMultiMeasureRests) && t == Element::MEASURE) {
2156
+ Measure* m = static_cast <Measure*>(mb);
2157
+ if (m->hasMMRest ())
2158
+ mb = m->mmRest ();
2159
+ }
2155
2160
mb->setSystem (system);
2156
2161
system->measures ().append (mb);
2157
2162
}
2158
2163
if (system->measures ().isEmpty ())
2159
2164
return ;
2160
- addSystemHeader (firstMeasure (), true );
2161
- removeGeneratedElements (firstMeasure (), lastMeasure ());
2165
+ addSystemHeader (firstMeasureMM (), true );
2166
+ removeGeneratedElements (firstMeasureMM (), lastMeasureMM ());
2162
2167
2163
2168
QPointF pos (0.0 , 0.0 );
2164
2169
bool isFirstMeasure = true ;
2165
- foreach (MeasureBase* mb, system->measures ()) {
2170
+ foreach (MeasureBase* mb, system->measures ()) {
2166
2171
qreal w = 0.0 ;
2167
2172
if (mb->type () == Element::MEASURE) {
2168
2173
if (isFirstMeasure) {
You can’t perform that action at this time.
0 commit comments