diff options
| author | Florian Jung <flo@windfisch.org> | 2011-05-19 16:57:13 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-05-19 16:57:13 +0000 |
| commit | 5d531cd32eb2053f10a349ee9a7d542bc550815c (patch) | |
| tree | c14c63ec20383d77f966737629507005bf0bb823 /muse2 | |
| parent | 9284586c256dfc058040df57664eddd91b73db85 (diff) | |
changed ctrl-edit's behaviour when control key is pressed
added line tool to drum editor
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/muse/ctrl/ctrlcanvas.cpp | 7 | ||||
| -rw-r--r-- | muse2/muse/midiedit/drumedit.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp index 70d1ad63..f2f335cf 100644 --- a/muse2/muse/ctrl/ctrlcanvas.cpp +++ b/muse2/muse/ctrl/ctrlcanvas.cpp @@ -797,13 +797,10 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event) break; case PencilTool: - if (ctrlKey) { - if (type != MidiController::Velo) { + if ((!ctrlKey) && (type != MidiController::Velo)) { drag = DRAG_NEW; song->startUndo(); - ///newVal(xpos, xpos, ypos); newVal(xpos, ypos); - } } else { drag = DRAG_RESIZE; @@ -824,7 +821,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event) if (drawLineMode) { line2x = xpos; line2y = ypos; - if (ctrlKey) + if ((!ctrlKey) && (type != MidiController::Velo)) newValRamp(line1x, line1y, line2x, line2y); else changeValRamp(line1x, line1y, line2x, line2y); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index 1b7001f2..f95ee4f6 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -69,7 +69,7 @@ QByteArray DrumEdit::_toolbarInit; static const int xscale = -10; static const int yscale = 1; -static const int drumeditTools = PointerTool | PencilTool | RubberTool | CursorTool; +static const int drumeditTools = PointerTool | PencilTool | RubberTool | CursorTool | DrawTool; enum DrumColumn { COL_MUTE = 0, |