Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
a85fb91a
Commit
a85fb91a
authored
May 31, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix razor timeline cursor broken.
Fixes
#706
parent
3332e473
Pipeline
#21997
passed with stage
in 20 minutes and 48 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
a85fb91a
...
...
@@ -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
...
...
src/timeline2/view/qml/Composition.qml
View file @
a85fb91a
...
...
@@ -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
...
...
src/timeline2/view/qml/timeline.qml
View file @
a85fb91a
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment