Skip to content

Commit

Permalink
fix navigator & page settings
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed Jul 19, 2012
1 parent 875804f commit d2acc82
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions mscore/navigator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ void Navigator::paintEvent(QPaintEvent* ev)
QPainter p(this);
QRect r(ev->rect());

// p.fillRect(r, Qt::gray);
QRegion region(r);

npcl.clear();
Expand Down Expand Up @@ -423,7 +422,7 @@ void Navigator::paintEvent(QPaintEvent* ev)
p.drawRect(viewRect);
}
if (!npcl.isEmpty()) {
//TODOWS updatePixmap = QtConcurrent::map(npcl, createPixmap);
updatePixmap = QtConcurrent::map(npcl, createPixmap);
watcher.setFuture(updatePixmap);
}
}
Expand Down
4 changes: 1 addition & 3 deletions mscore/palette.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void Palette::setGrid(int hh, int vv)
//---------------------------------------------------------

Element* Palette::element(int idx)
{
{
if (idx < size() && cells[idx])
return cells[idx]->element;
else
Expand Down Expand Up @@ -234,7 +234,6 @@ void Palette::mouseDoubleClickEvent(QMouseEvent* ev)
if (sel.state() == SEL_NONE)
return;

// QMimeData* mimeData = new QMimeData;
Element* element = 0;
if (i < size() && cells[i])
element = cells[i]->element;
Expand All @@ -243,7 +242,6 @@ void Palette::mouseDoubleClickEvent(QMouseEvent* ev)
ScoreView* viewer = mscore->currentScoreView();


// mimeData->setData(mimeSymbolFormat, element->mimeData(QPointF()));
if (viewer->mscoreState() != STATE_EDIT && viewer->mscoreState() != STATE_LYRICS_EDIT) // Already in startCmd in this case
score->startCmd();
if (sel.state() == SEL_LIST) {
Expand Down

0 comments on commit d2acc82

Please sign in to comment.