Commit 17eea317 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix timeline ruler not working after effect drop in some circumstances.

Related to #1306
parent d8b2a256
......@@ -241,6 +241,7 @@ Rectangle {
onEntered: {
dropData = drag.getDataAsString('kdenlive/effect')
dropSource = drag.getDataAsString('kdenlive/effectsource')
updateDrag()
}
onDropped: {
console.log("Add effect: ", dropData)
......@@ -252,7 +253,10 @@ Rectangle {
}
dropSource = ''
dropRow = -1
drag.acceptProposedAction
drag.acceptProposedAction.
}
onExited: {
endDrag()
}
}
MouseArea {
......
......@@ -1191,7 +1191,7 @@ Rectangle {
trimmingClickFrame = Math.round((scrollView.contentX + mouse.x) / timeline.scaleFactor)
timeline.requestStartTrimmingMode(mainClip.clipId, shiftPress)
}
if (dragProxy.draggedItem > -1) {
if (dragProxy.draggedItem > -1 && mouse.y > ruler.height) {
mouse.accepted = false
return
}
......
Supports Markdown
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