Skip to content
GitLab
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
07bdbfa4
Commit
07bdbfa4
authored
Mar 02, 2020
by
Jean-Baptiste Mardelle
Browse files
Don't delete clip when dragging from bin and trying to put it at frame 0 in timeline
parent
47203736
Pipeline
#15889
passed with stage
in 13 minutes and 49 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
07bdbfa4
...
...
@@ -338,7 +338,7 @@ Rectangle {
keys
:
'
kdenlive/composition
'
onEntered
:
{
console
.
log
(
"
Trying to drop composition
"
)
if
(
clipBeingMovedId
==
-
1
)
{
if
(
clipBeingMovedId
==
-
1
&&
clipBeingDroppedId
==
-
1
)
{
console
.
log
(
"
No clip being moved
"
)
var
track
=
Logic
.
getTrackIdFromPos
(
drag
.
y
+
scrollView
.
contentY
)
var
frame
=
Math
.
round
((
drag
.
x
+
scrollView
.
contentX
)
/
timeline
.
scaleFactor
)
...
...
@@ -377,7 +377,8 @@ Rectangle {
}
}
onExited
:{
if
(
clipBeingDroppedId
!=
-
1
)
{
if
(
clipBeingDroppedId
!=
-
1
&&
drag
.
y
<
drag
.
x
)
{
// If we exit on top, remove clip
controller
.
requestItemDeletion
(
clipBeingDroppedId
,
false
)
}
clearDropData
()
...
...
@@ -424,7 +425,7 @@ Rectangle {
x
:
headerWidth
keys
:
'
kdenlive/producerslist
'
onEntered
:
{
if
(
clipBeingMovedId
==
-
1
)
{
if
(
clipBeingMovedId
==
-
1
&&
clipBeingDroppedId
==
-
1
)
{
//var track = Logic.getTrackIdFromPos(drag.y)
var
track
=
Logic
.
getTrackIndexFromPos
(
drag
.
y
+
scrollView
.
contentY
)
if
(
track
>=
0
&&
track
<
tracksRepeater
.
count
)
{
...
...
@@ -453,7 +454,8 @@ Rectangle {
}
}
onExited
:{
if
(
clipBeingDroppedId
!=
-
1
)
{
if
(
clipBeingDroppedId
!=
-
1
&&
drag
.
y
<
drag
.
x
)
{
// If we exit on top, remove clip
controller
.
requestItemDeletion
(
clipBeingDroppedId
,
false
)
}
clearDropData
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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