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
6657c4f6
Commit
6657c4f6
authored
Jul 08, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix tools cursor when hovering a clip in timeline
parent
a67d946e
Pipeline
#5081
passed with stage
in 17 minutes and 31 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
6657c4f6
...
...
@@ -234,7 +234,7 @@ Rectangle {
anchors.fill
:
clipRoot
acceptedButtons
:
Qt
.
RightButton
hoverEnabled
:
root
.
activeTool
===
0
cursorShape
:
dragProxy
Area
.
drag
.
active
?
Qt
.
ClosedHandCursor
:
Qt
.
OpenHandCursor
cursorShape
:
(
trimInMouseArea
.
drag
.
active
||
trimOutMouse
Area
.
drag
.
active
)
?
Qt
.
SizeHorCursor
:
dragProxyArea
.
cursorShape
onPressed
:
{
root
.
stopScrolling
=
true
if
(
mouse
.
button
==
Qt
.
RightButton
)
{
...
...
src/timeline2/view/qml/Composition.qml
View file @
6657c4f6
...
...
@@ -135,7 +135,7 @@ Item {
Keys.onDownPressed
:
{
controller
.
requestCompositionMove
(
compositionRoot
.
clipId
,
controller
.
getPreviousTrackId
(
compositionRoot
.
originalTrackId
),
compositionRoot
.
modelStart
,
true
,
true
)
}
cursorShape
:
(
trimInMouseArea
.
drag
.
active
||
trimOutMouseArea
.
drag
.
active
)?
Qt
.
SizeHorCursor
:
dragProxyArea
.
drag
.
active
?
Qt
.
ClosedHandCursor
:
Qt
.
OpenHandCursor
cursorShape
:
(
trimInMouseArea
.
drag
.
active
||
trimOutMouseArea
.
drag
.
active
)?
Qt
.
SizeHorCursor
:
dragProxyArea
.
cursorShape
onPressed
:
{
root
.
stopScrolling
=
true
...
...
src/timeline2/view/qml/timeline.qml
View file @
6657c4f6
...
...
@@ -1102,6 +1102,7 @@ Rectangle {
drag.minimumX
:
0
property
int
dragFrame
property
bool
shiftClick
:
false
cursorShape
:
root
.
activeTool
==
0
?
dragProxyArea
.
drag
.
active
?
Qt
.
ClosedHandCursor
:
Qt
.
OpenHandCursor
:
tracksArea
.
cursorShape
enabled
:
root
.
activeTool
==
0
onPressed
:
{
console
.
log
(
'
+++++++++++++++++++ DRAG CLICKED +++++++++++++
'
)
...
...
Camille Moulin
@camillem
mentioned in issue
#22 (closed)
·
Oct 12, 2019
mentioned in issue
#22 (closed)
mentioned in issue #22
Toggle commit list
Camille Moulin
@camillem
mentioned in issue
#136 (closed)
·
Oct 12, 2019
mentioned in issue
#136 (closed)
mentioned in issue #136
Toggle commit list
Write
Preview
Markdown
is supported
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