diff options
author | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
commit | 0002e57359fb002a70cc9559308619ff611718c9 (patch) | |
tree | 4d430468df5c1a38895ae9f56a61127240e5ea2b /muse2/muse/midiedit/dcanvas.cpp | |
parent | 3513555193d44fe99bc30dd3bf04701278a797a1 (diff) | |
parent | 35c95c10cca9938210818c0b809b1ff4f9c4ad3d (diff) |
merged with trunk, except:
- not applied the "masteredit saves toolbar state" change, as this
is done by TopWin here in experimental
- fixed some indentation error in scoreedit.cpp
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.cpp')
-rw-r--r-- | muse2/muse/midiedit/dcanvas.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp index 921e59f6..615653b3 100644 --- a/muse2/muse/midiedit/dcanvas.cpp +++ b/muse2/muse/midiedit/dcanvas.cpp @@ -158,7 +158,7 @@ Undo DrumCanvas::moveCanvasItems(CItemList& items, int dp, int dx, DragType dtyp for(iPartToChange ip2c = parts2change.begin(); ip2c != parts2change.end(); ++ip2c) { Part* opart = ip2c->first; - if (opart->hasHiddenNotes()) + if (opart->hasHiddenEvents()) { forbidden=true; break; @@ -350,7 +350,7 @@ void DrumCanvas::newItem(CItem* item, bool noSnap, bool replace) Undo operations; int diff = event.endTick()-part->lenTick(); - if (! ((diff > 0) && part->hasHiddenNotes()) ) //operation is allowed + if (! ((diff > 0) && part->hasHiddenEvents()) ) //operation is allowed { operations.push_back(UndoOp(UndoOp::AddEvent,event, part, false, false)); @@ -463,8 +463,6 @@ void DrumCanvas::drawMoving(QPainter& p, const CItem* item, const QRect& rect) // drawCanvas //--------------------------------------------------------- -extern void drawTickRaster(QPainter& p, int, int, int, int, int); - void DrumCanvas::drawCanvas(QPainter& p, const QRect& rect) { int x = rect.x(); |