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
6e0ede64
Commit
6e0ede64
authored
Jan 20, 2022
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
6e0ede64
...
...
@@ -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
...
...
src/timeline2/view/qml/timeline.qml
View file @
6e0ede64
...
...
@@ -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
}
...
...
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