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

fix #8808 limit scroll area of the score view

Browse source
This commit is contained in:
AntonioBL 2015-02-19 10:59:48 +01:00
parent 329124c789
commit 3fe4a3b1ef
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mscore/scoreview.cpp
View file

@ -2136,19 +2136,11 @@ void ScoreView::wheelEvent(QWheelEvent* event)
}
//-----------------------------------------------------------------------------
// constraints
// (ws: too restrictive; it should be possible at least to move the right edge
// of the score to center of the screen (or top, left, bottom).
// I do this often before zooming in.
// I believe there should be no limitation at all. Its irritating that dragging
// the canvas sometimes work and sometimes not bc. of some arbitrary limitation
// which is not immediate obvious.)
// constraintCanvas
//-----------------------------------------------------------------------------
void ScoreView::constraintCanvas (int* /*dxx*/, int* /*dyy*/)
void ScoreView::constraintCanvas (int* dxx, int* dyy)
{
#if 0
const qreal margin = 50.0; //move to preferences?
int dx = *dxx;
int dy = *dyy;
QRectF rect = QRectF(0, 0, width(), height());
@ -2167,7 +2159,9 @@ void ScoreView::constraintCanvas (int* /*dxx*/, int* /*dyy*/)
lastPage->width() * mag(),
lastPage->height() * mag());
QRectF pagesRect = firstPageRect.unite(lastPageRect).translated(offsetPt);
pagesRect.adjust(-margin, -margin, margin, margin);
qreal hmargin = this->width() * 0.75;
qreal vmargin = this->height() * 0.75;
pagesRect.adjust(-hmargin, -vmargin, hmargin, vmargin);
QRectF toPagesRect = pagesRect.translated(dx, dy);
// move right
@ -2216,7 +2210,6 @@ void ScoreView::constraintCanvas (int* /*dxx*/, int* /*dyy*/)
}
*dxx = dx;
*dyy = dy;
#endif
}
//---------------------------------------------------------

2
mscore/scoreview.h
View file

@ -203,7 +203,7 @@ class ScoreView : public QWidget, public MuseScoreView {
virtual void focusInEvent(QFocusEvent*);
virtual void focusOutEvent(QFocusEvent*);
virtual void mouseReleaseEvent(QMouseEvent*);
void constraintCanvas(int*, int*);
void constraintCanvas(int *dxx, int *dyy);
void contextItem(Element*);