Commit 6e0ede64 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 26682511
Pipeline #125916 passed with stage
in 7 minutes and 15 seconds
......@@ -255,6 +255,7 @@ Rectangle {
onEntered: {
dropData = drag.getDataAsString('kdenlive/effect')
dropSource = drag.getDataAsString('kdenlive/effectsource')
updateDrag()
}
onDropped: {
console.log("Add effect: ", dropData)
......@@ -267,9 +268,11 @@ Rectangle {
dropSource = ''
dropRow = -1
drag.acceptProposedAction
updateDrag()
//console.log('KFR VIEW VISIBLE: ', effectRow.visible, ', SOURCE: ', effectRow.source, '\n HIDEVIEW:', clipRoot.hideClipViews<<', UNDEFINED: ', (clipRoot.keyframeModel == undefined))
}
onExited: {
endDrag()
}
}
MouseArea {
id: mouseArea
......
......@@ -1228,7 +1228,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