diff options
author | Florian Jung <flo@windfisch.org> | 2011-06-27 18:23:39 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-06-27 18:23:39 +0000 |
commit | 933aeb536f3d90eb38bc96308de628eeedd81755 (patch) | |
tree | 471aba95c16c939c696a4301ce2be45a7e583789 /muse2/muse/midiedit/dcanvas.h | |
parent | d1b2d6ec4fe4206182e0cead1e734adfc3ae6df6 (diff) | |
parent | 637498c87bf1ac780d8527d0596936fcdd2c6dfc (diff) |
merged stuff from experimental back to trunk:
- massively speeded up muse by using operation groups
- changed behaviour of mid-click to "delete" in all canvases
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.h')
-rw-r--r-- | muse2/muse/midiedit/dcanvas.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h index fa087343..868113a6 100644 --- a/muse2/muse/midiedit/dcanvas.h +++ b/muse2/muse/midiedit/dcanvas.h @@ -54,10 +54,8 @@ class DrumCanvas : public EventCanvas { virtual void drawItem(QPainter&, const CItem*, const QRect&); void drawTopItem(QPainter& p, const QRect& rect); virtual void drawMoving(QPainter&, const CItem*, const QRect&); - virtual void moveCanvasItems(CItemList&, int, int, DragType, int*); - // Changed by T356. - //virtual bool moveItem(CItem*, const QPoint&, DragType, int*); - virtual bool moveItem(CItem*, const QPoint&, DragType); + virtual Undo moveCanvasItems(CItemList&, int, int, DragType); + virtual UndoOp moveItem(CItem*, const QPoint&, DragType); virtual CItem* newItem(const QPoint&, int); virtual void resizeItem(CItem*, bool); virtual void newItem(CItem*, bool); |