Commit 98196d3c authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Allow Shift+Alt as alternate shortcut to move single clip to another track.

Related to #337
parent 7688206e
Pipeline #22605 passed with stage
in 9 minutes and 28 seconds
...@@ -802,7 +802,7 @@ Rectangle { ...@@ -802,7 +802,7 @@ Rectangle {
} }
onPressed: { onPressed: {
focus = true focus = true
shiftPress = (mouse.modifiers & Qt.ShiftModifier) && (mouse.y > ruler.height) shiftPress = (mouse.modifiers & Qt.ShiftModifier) && (mouse.y > ruler.height) && !(mouse.modifiers & Qt.AltModifier)
if (mouse.buttons === Qt.MidButton || (root.activeTool == 0 && (mouse.modifiers & Qt.ControlModifier) && !shiftPress)) { if (mouse.buttons === Qt.MidButton || (root.activeTool == 0 && (mouse.modifiers & Qt.ControlModifier) && !shiftPress)) {
clickX = mouseX clickX = mouseX
clickY = mouseY clickY = mouseY
...@@ -1095,7 +1095,7 @@ Rectangle { ...@@ -1095,7 +1095,7 @@ Rectangle {
enabled: root.activeTool == 0 enabled: root.activeTool == 0
onPressed: { onPressed: {
console.log('+++++++++++++++++++ DRAG CLICKED +++++++++++++') console.log('+++++++++++++++++++ DRAG CLICKED +++++++++++++')
if (mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier) { if (mouse.modifiers & Qt.ControlModifier || (mouse.modifiers & Qt.ShiftModifier && !(mouse.modifiers & Qt.AltModifier))) {
mouse.accepted = false mouse.accepted = false
console.log('+++++++++++++++++++ Shift abort+++++++++++++') console.log('+++++++++++++++++++ Shift abort+++++++++++++')
return return
...@@ -1106,7 +1106,7 @@ Rectangle { ...@@ -1106,7 +1106,7 @@ Rectangle {
return return
} }
dragFrame = -1 dragFrame = -1
moveMirrorTracks = !(mouse.modifiers & Qt.MetaModifier) moveMirrorTracks = !(mouse.modifiers & Qt.MetaModifier) && !(mouse.modifiers == (Qt.ShiftModifier | Qt.AltModifier))
timeline.activeTrack = dragProxy.sourceTrack timeline.activeTrack = dragProxy.sourceTrack
if (timeline.selection.indexOf(dragProxy.draggedItem) == -1) { if (timeline.selection.indexOf(dragProxy.draggedItem) == -1) {
controller.requestAddToSelection(dragProxy.draggedItem, /*clear=*/ true) controller.requestAddToSelection(dragProxy.draggedItem, /*clear=*/ true)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment