Skip to content

Commit

Permalink
fix #25208: Page Settings margins not synced
Browse files Browse the repository at this point in the history
  • Loading branch information
lasconic committed Apr 2, 2014
1 parent d2a6835 commit 03de8d7
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions mscore/pagesettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ void PageSettings::olmChanged(double val)
}
PageFormat pf;
pf.copy(*preview->score()->pageFormat());
pf.setPrintableWidth(pf.size().width() - pf.oddRightMargin() - val);
pf.setPrintableWidth(pf.width() - pf.oddRightMargin() - val);
pf.setOddLeftMargin(val);
preview->score()->setPageFormat(pf);

Expand All @@ -397,6 +397,7 @@ void PageSettings::ormChanged(double val)
if (twosided->isChecked()) {
evenPageLeftMargin->blockSignals(true);
evenPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0));
pf.setEvenLeftMargin(val);
evenPageLeftMargin->blockSignals(false);
}
else {
Expand All @@ -405,7 +406,8 @@ void PageSettings::ormChanged(double val)
evenPageRightMargin->blockSignals(false);
}

pf.setPrintableWidth(pf.size().width() - pf.oddLeftMargin() - val);
pf.setPrintableWidth(pf.width() - pf.oddLeftMargin() - val);

preview->score()->setPageFormat(pf);
updatePreview(0);
}
Expand Down Expand Up @@ -458,7 +460,7 @@ void PageSettings::elmChanged(double val)
}
PageFormat pf;
pf.copy(*preview->score()->pageFormat());
pf.setPrintableWidth(pf.size().width() - pf.evenRightMargin() - val);
pf.setPrintableWidth(pf.width() - pf.evenRightMargin() - val);
pf.setEvenLeftMargin(val);
preview->score()->setPageFormat(pf);

Expand All @@ -482,7 +484,7 @@ void PageSettings::ermChanged(double val)

PageFormat pf;
pf.copy(*preview->score()->pageFormat());
pf.setPrintableWidth(pf.size().width() - pf.evenLeftMargin() - val);
pf.setPrintableWidth(pf.width() - pf.evenLeftMargin() - val);
pf.setOddLeftMargin(val);
preview->score()->setPageFormat(pf);
updatePreview(0);
Expand Down

0 comments on commit 03de8d7

Please sign in to comment.