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
388c8188
Commit
388c8188
authored
Jun 19, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix timeline playing autoscroll incorrectly enabled
CCBUG: 455512
parent
52e5f1bd
Pipeline
#192791
passed with stage
in 9 minutes and 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
388c8188
...
...
@@ -319,7 +319,7 @@ Rectangle {
dragProxy
.
width
=
0
dragProxy
.
height
=
0
dragProxy
.
verticalOffset
=
0
root
.
a
utoScroll
ing
=
timeline
.
autoScroll
root
.
blockA
utoScroll
=
false
}
function
regainFocus
(
mousePos
)
{
...
...
@@ -363,7 +363,7 @@ Rectangle {
endDrag
()
}
}
root
.
a
utoScroll
ing
=
timeline
.
autoScroll
root
.
blockA
utoScroll
=
false
}
function
getAudioTracksCount
(){
...
...
@@ -418,6 +418,7 @@ Rectangle {
property
color
selectedTrackColor
:
Qt
.
rgba
(
activePalette
.
highlight
.
r
,
activePalette
.
highlight
.
g
,
activePalette
.
highlight
.
b
,
0.2
)
property
color
frameColor
:
Qt
.
rgba
(
activePalette
.
shadow
.
r
,
activePalette
.
shadow
.
g
,
activePalette
.
shadow
.
b
,
0.5
)
property
bool
autoScrolling
:
timeline
.
autoScroll
property
bool
blockAutoScroll
:
false
property
int
duration
:
timeline
.
duration
property
color
audioColor
:
timeline
.
audioColor
property
color
videoColor
:
timeline
.
videoColor
...
...
@@ -500,7 +501,7 @@ Rectangle {
}
onConsumerPositionChanged
:
{
if
(
root
.
autoScrolling
)
Logic
.
scrollIfNeeded
()
if
(
root
.
autoScrolling
&&
!
root
.
blockAutoScroll
)
Logic
.
scrollIfNeeded
()
}
onViewActiveTrackChanged
:
{
...
...
@@ -1195,10 +1196,10 @@ Rectangle {
drag.smoothed
:
false
onPressed
:
{
root
.
a
utoScroll
ing
=
fals
e
root
.
blockA
utoScroll
=
tru
e
}
onReleased
:
{
root
.
a
utoScroll
ing
=
timeline
.
autoScroll
root
.
blockA
utoScroll
=
false
parent
.
opacity
=
0
}
onEntered
:
parent
.
opacity
=
0.5
...
...
@@ -1734,7 +1735,7 @@ Rectangle {
controller
.
requestAddToSelection
(
dragProxy
.
draggedItem
,
/*clear=*/
true
)
}
timeline
.
showAsset
(
dragProxy
.
draggedItem
)
root
.
a
utoScroll
ing
=
fals
e
root
.
blockA
utoScroll
=
tru
e
clipBeingMovedId
=
dragProxy
.
draggedItem
if
(
dragProxy
.
draggedItem
>
-
1
)
{
var
tk
=
controller
.
getItemTrackId
(
dragProxy
.
draggedItem
)
...
...
@@ -1845,7 +1846,7 @@ Rectangle {
}
onReleased
:
{
clipBeingMovedId
=
-
1
root
.
a
utoScroll
ing
=
timeline
.
autoScroll
root
.
blockA
utoScroll
=
false
if
(
dragProxy
.
draggedItem
>
-
1
&&
dragFrame
>
-
1
&&
(
controller
.
isClip
(
dragProxy
.
draggedItem
)
||
controller
.
isComposition
(
dragProxy
.
draggedItem
)))
{
var
tId
=
controller
.
getItemTrackId
(
dragProxy
.
draggedItem
)
if
(
dragProxy
.
isComposition
)
{
...
...
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