Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
9a51d703
Commit
9a51d703
authored
Aug 31, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression breaking timeline resize
parent
853bbd53
Pipeline
#7188
passed with stage
in 22 minutes and 37 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
19 deletions
+19
-19
src/timeline2/view/qml/Clip.qml
src/timeline2/view/qml/Clip.qml
+9
-9
src/timeline2/view/qml/Composition.qml
src/timeline2/view/qml/Composition.qml
+6
-6
src/timeline2/view/qml/KeyframeView.qml
src/timeline2/view/qml/KeyframeView.qml
+2
-2
src/timeline2/view/qml/TrackHead.qml
src/timeline2/view/qml/TrackHead.qml
+2
-2
No files found.
src/timeline2/view/qml/Clip.qml
View file @
9a51d703
...
...
@@ -242,7 +242,7 @@ Rectangle {
hoverEnabled
:
root
.
activeTool
===
0
cursorShape
:
(
trimInMouseArea
.
drag
.
active
||
trimOutMouseArea
.
drag
.
active
)?
Qt
.
SizeHorCursor
:
dragProxyArea
.
cursorShape
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
if
(
mouse
.
button
==
Qt
.
RightButton
)
{
if
(
timeline
.
selection
.
indexOf
(
clipRoot
.
clipId
)
==
-
1
)
{
controller
.
requestAddToSelection
(
clipRoot
.
clipId
,
true
)
...
...
@@ -647,7 +647,7 @@ Rectangle {
}
}
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
startX
=
Math
.
round
(
parent
.
x
/
timeScale
)
startFadeIn
=
clipRoot
.
fadeIn
parent
.
anchors
.
left
=
undefined
...
...
@@ -657,7 +657,7 @@ Rectangle {
// parentTrack.clipSelected(clipRoot, parentTrack) TODO
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
fadeInTriangle
.
opacity
=
0.3
parent
.
opacity
=
0
if
(
fadeInTriangle
.
width
>
parent
.
radius
)
...
...
@@ -746,7 +746,7 @@ Rectangle {
}
drag.smoothed
:
false
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
startX
=
Math
.
round
(
parent
.
x
/
timeScale
)
startFadeOut
=
clipRoot
.
fadeOut
parent
.
anchors
.
right
=
undefined
...
...
@@ -757,7 +757,7 @@ Rectangle {
onReleased
:
{
fadeOutCanvas
.
opacity
=
0.3
parent
.
opacity
=
0
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
if
(
fadeOutCanvas
.
width
>
parent
.
radius
)
parent
.
anchors
.
horizontalCenter
=
fadeOutCanvas
.
left
else
...
...
@@ -842,7 +842,7 @@ Rectangle {
property
bool
sizeChanged
:
false
cursorShape
:
(
containsMouse
?
Qt
.
SizeHorCursor
:
Qt
.
ClosedHandCursor
);
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
clipRoot
.
originalX
=
clipRoot
.
x
clipRoot
.
originalDuration
=
clipDuration
parent
.
anchors
.
left
=
undefined
...
...
@@ -854,7 +854,7 @@ Rectangle {
parent
.
opacity
=
0
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
parent
.
anchors
.
left
=
clipRoot
.
left
if
(
sizeChanged
)
{
clipRoot
.
trimmedIn
(
clipRoot
,
shiftTrim
,
controlTrim
)
...
...
@@ -925,7 +925,7 @@ Rectangle {
drag.smoothed
:
false
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
clipRoot
.
originalDuration
=
clipDuration
parent
.
anchors
.
right
=
undefined
shiftTrim
=
mouse
.
modifiers
&
Qt
.
ShiftModifier
...
...
@@ -936,7 +936,7 @@ Rectangle {
parent
.
opacity
=
0
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
parent
.
anchors
.
right
=
clipRoot
.
right
if
(
sizeChanged
)
{
clipRoot
.
trimmedOut
(
clipRoot
,
shiftTrim
,
controlTrim
)
...
...
src/timeline2/view/qml/Composition.qml
View file @
9a51d703
...
...
@@ -146,7 +146,7 @@ Item {
cursorShape
:
(
trimInMouseArea
.
drag
.
active
||
trimOutMouseArea
.
drag
.
active
)?
Qt
.
SizeHorCursor
:
dragProxyArea
.
cursorShape
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
compositionRoot
.
forceActiveFocus
();
if
(
mouse
.
button
==
Qt
.
RightButton
)
{
if
(
timeline
.
selection
.
indexOf
(
compositionRoot
.
clipId
)
==
-
1
)
{
...
...
@@ -159,7 +159,7 @@ Item {
}
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
}
onEntered
:
{
var
itemPos
=
mapToItem
(
tracksContainerArea
,
0
,
0
,
width
,
height
)
...
...
@@ -285,13 +285,13 @@ Item {
drag.smoothed
:
false
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
compositionRoot
.
originalX
=
compositionRoot
.
x
compositionRoot
.
originalDuration
=
clipDuration
parent
.
anchors
.
left
=
undefined
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
parent
.
anchors
.
left
=
displayRect
.
left
compositionRoot
.
trimmedIn
(
compositionRoot
)
parent
.
opacity
=
0
...
...
@@ -335,12 +335,12 @@ Item {
drag.smoothed
:
false
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
compositionRoot
.
originalDuration
=
clipDuration
parent
.
anchors
.
right
=
undefined
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
parent
.
anchors
.
right
=
displayRect
.
right
compositionRoot
.
trimmedOut
(
compositionRoot
)
}
...
...
src/timeline2/view/qml/KeyframeView.qml
View file @
9a51d703
...
...
@@ -120,7 +120,7 @@ Rectangle
drag.smoothed
:
false
drag.axis
:
Drag
.
XAxis
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
dragPos
=
-
1
var
newPos
=
Math
.
round
(
parent
.
x
/
timeScale
)
+
inPoint
if
(
frame
!=
inPoint
&&
newPos
!=
frame
)
{
...
...
@@ -178,7 +178,7 @@ Rectangle
keyframeContainer
.
focus
=
true
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
var
newPos
=
frame
==
inPoint
?
inPoint
:
Math
.
round
((
keyframe
.
x
+
parent
.
x
+
root
.
baseUnit
/
2
)
/
timeScale
)
+
inPoint
if
(
newPos
==
frame
&&
keyframe
.
value
==
keyframe
.
height
-
parent
.
y
-
root
.
baseUnit
/
2
)
{
var
pos
=
masterObject
.
modelStart
+
frame
-
inPoint
...
...
src/timeline2/view/qml/TrackHead.qml
View file @
9a51d703
...
...
@@ -466,12 +466,12 @@ Rectangle {
drag.smoothed
:
false
onPressed
:
{
root
.
stopScrolling
=
tru
e
root
.
autoScrolling
=
fals
e
startY
=
mapToItem
(
null
,
x
,
y
).
y
originalY
=
trackHeadRoot
.
height
// reusing originalX to accumulate delta for bubble help
}
onReleased
:
{
root
.
stopScrolling
=
false
root
.
autoScrolling
=
timeline
.
autoScroll
if
(
!
trimInMouseArea
.
containsMouse
)
{
parent
.
opacity
=
0
}
...
...
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