Fix razor timeline cursor broken.

Fixes #706
parent 3332e473
Pipeline #21997 passed with stage
in 20 minutes and 48 seconds
......@@ -385,6 +385,7 @@ Rectangle {
x: -clipRoot.border.width
height: parent.height
width: root.baseUnit / 2
visible: root.activeTool === 0
enabled: !isLocked && (pressed || clipRoot.width > 3 * width)
hoverEnabled: true
drag.target: trimInMouseArea
......@@ -473,6 +474,7 @@ Rectangle {
height: parent.height
width: root.baseUnit / 2
hoverEnabled: true
visible: root.activeTool === 0
enabled: !isLocked && (pressed || clipRoot.width > 3 * width)
property bool shiftTrim: false
property bool controlTrim: false
......
......@@ -131,7 +131,8 @@ Item {
id: mouseArea
anchors.fill: displayRect
acceptedButtons: Qt.RightButton
hoverEnabled: true
enabled: root.activeTool === 0
hoverEnabled: root.activeTool === 0
Keys.onShortcutOverride: event.accepted = compositionRoot.isGrabbed && (event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Up || event.key === Qt.Key_Down || event.key === Qt.Key_Escape)
Keys.onLeftPressed: {
var offset = event.modifiers === Qt.ShiftModifier ? timeline.fps() : 1
......@@ -304,6 +305,7 @@ Item {
drag.target: parent
drag.axis: Drag.XAxis
drag.smoothed: false
visible: root.activeTool === 0
onPressed: {
root.autoScrolling = false
......@@ -354,6 +356,7 @@ Item {
drag.target: parent
drag.axis: Drag.XAxis
drag.smoothed: false
visible: root.activeTool === 0
onPressed: {
root.autoScrolling = false
......
......@@ -1284,7 +1284,7 @@ Rectangle {
color: 'red'
width: Math.max(1, 1 * timeline.scaleFactor)
opacity: (width > 2) ? 0.5 : 1
height: root.height - vertScroll.height - ruler.height
height: tracksContainerArea.height
x: 0
//x: root.consumerPosition * timeline.scaleFactor - scrollView.contentX
y: ruler.height
......
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