summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets/canvas.cpp
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-04-09 21:25:50 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-04-09 21:25:50 +0000
commitf8220785a652ccff66fd46ebc440ac8071288511 (patch)
tree587ce99a5ff77856512d5aad13e945da01a8bbf0 /muse2/muse/widgets/canvas.cpp
parentf08685a55d5090a2a22cb2808e788912cb739b99 (diff)
minor fixes
Diffstat (limited to 'muse2/muse/widgets/canvas.cpp')
-rw-r--r--muse2/muse/widgets/canvas.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp
index ff9d0c3b..596e4067 100644
--- a/muse2/muse/widgets/canvas.cpp
+++ b/muse2/muse/widgets/canvas.cpp
@@ -586,21 +586,14 @@ void Canvas::viewMousePressEvent(QMouseEvent* event)
// Changed by T356. Alt is default reserved for moving the whole window in KDE. Changed to Shift-Alt.
// Hmm, nope, shift-alt is also reserved sometimes. Must find a way to bypass,
// why make user turn off setting? Left alone for now...
- if (shift)
+ if (shift && !ctrl)
drag = DRAG_COPY_START;
else if (alt) {
drag = DRAG_CLONE_START;
}
- //
- //if (shift)
- //{
- // if (alt)
- // drag = DRAG_CLONE_START;
- // else
- // drag = DRAG_COPY_START;
- //}
else if (ctrl) { //Select all on the same pitch (e.g. same y-value)
- deselectAll();
+ if (!shift)
+ deselectAll();
//printf("Yes, ctrl and press\n");
for (iCItem i = items.begin(); i != items.end(); ++i) {
if (i->second->y() == curItem->y() )