LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ported #6422 : allow changing staff visibility mid-score

Browse source
This commit is contained in:
Igor Korsukov 2021-02-05 13:53:15 +02:00 committed by pereverzev+v
parent 5e33c88189
commit a1e3954135
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libmscore/barline.cpp
View file

@ -489,7 +489,7 @@ void BarLine::getY() const
int from = _spanFrom;
int to = _spanTo;
int oneLine = st1->lines() == 1;
int oneLine = st1->lines() <= 1;
if (oneLine && _spanFrom == 0) {
from = BARLINE_SPAN_1LINESTAFF_FROM;
if (!_spanStaff || (staffIdx1 == nstaves - 1)) {

2
src/libmscore/stafflines.cpp
View file

@ -113,6 +113,8 @@ void StaffLines::layoutForWidth(qreal w)
if (_lines == 1) {
qreal extraSize = _spatium;
bbox().adjust(0, -extraSize, 0, extraSize);
} else if (_lines == 0) {
bbox().adjust(0, -2 * dist, 0, 2 * dist);
}
lines.clear();

2
src/libmscore/system.cpp
View file

@ -306,7 +306,7 @@ void System::layoutSystem(qreal xo1)
++nVisible;
qreal staffMag = staff->staffMag(Fraction(0,1)); // ??? TODO
int staffLines = staff->lines(Fraction(0,1));
if (staffLines == 1) {
if (staffLines <= 1) {
qreal h = staff->lineDistance(Fraction(0,1)) * staffMag * spatium();
s->bbox().setRect(_leftMargin + xo1, -h, 0.0, 2 * h);
} else {