Commit bf3ec045 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '2004'

parents cb7ac011 92f03c42
Pipeline #17158 passed with stage
in 13 minutes and 36 seconds
......@@ -267,7 +267,7 @@ Rectangle {
property int spacerFrame: -1
property int spacerClickFrame: -1
property real timeScale: timeline.scaleFactor
property real snapping: (timeline.snap && (timeScale < 2 * baseUnit)) ? baseUnit / (timeScale > 1 ? Math.sqrt(timeScale) : timeScale) : -1
property int snapping: (timeline.snap && (timeScale < 2 * baseUnit)) ? Math.floor(baseUnit / (timeScale > 3 ? timeScale / 2 : timeScale)) : -1
property var timelineSelection: timeline.selection
property int trackHeight
property int copiedClip: -1
......@@ -299,7 +299,7 @@ Rectangle {
// update dragged item pos
dragProxy.masterObject.updateDrag()
}
console.log('GOT SCALE: ', timeScale, ' - SNAPPING: ', snapping)
console.log('GOT SCALE: ', timeScale, ', BASE: ', baseUnit, ' - SNAPPING: ', snapping)
}
onConsumerPositionChanged: {
......
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