Skip to content

Commit

Permalink
fix #18187
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed Sep 24, 2012
1 parent 9e62388 commit 4c7c05a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions libmscore/rest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ int Rest::getSymbol(TDuration::DurationType type, int line, int lines, int* yoff

void Rest::layout()
{
rxpos() = 0.0;
if (staff() && staff()->isTabStaff()) {
StaffTypeTablature* tab = (StaffTypeTablature*)staff()->staffType();
// if rests are shown and note values are shown as duration symbols
Expand Down Expand Up @@ -351,12 +352,12 @@ void Rest::layout()
break;
}
qreal _spatium = spatium();
int stepOffset = 0;
int stepOffset = 0;
if (staff())
stepOffset = staff()->staffType()->stepOffset();
int line = lrint(userOff().y() / _spatium); // + ((staff()->lines()-1) * 2);
qreal lineDist = staff() ? staff()->staffType()->lineDistance().val() : 1.0;
int lineOffset = 0;
int line = lrint(userOff().y() / _spatium); // + ((staff()->lines()-1) * 2);
qreal lineDist = staff() ? staff()->staffType()->lineDistance().val() : 1.0;
int lineOffset = 0;

int lines = staff() ? staff()->lines() : 5;
if (segment() && measure() && measure()->mstaff(staffIdx())->hasVoices) {
Expand Down

0 comments on commit 4c7c05a

Please sign in to comment.