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
c5becebd
Commit
c5becebd
authored
Jan 22, 2020
by
Jean-Baptiste Mardelle
Browse files
Cleanup resize and other clip handles (fades, add composition, keyframes).
Related to
#527
parent
0f874a1f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
c5becebd
This diff is collapsed.
Click to expand it.
src/timeline2/view/qml/KeyframeView.qml
View file @
c5becebd
...
...
@@ -119,6 +119,7 @@ Rectangle
anchors.rightMargin
:
-
root
.
baseUnit
/
3
hoverEnabled
:
true
cursorShape
:
Qt
.
SizeHorCursor
visible
:
x
>
root
.
baseUnit
&&
x
<
keyframeContainer
.
width
-
root
.
baseUnit
drag.target
:
parent
drag.smoothed
:
false
drag.axis
:
Drag
.
XAxis
...
...
@@ -245,6 +246,7 @@ Rectangle
renderStrategy
:
Canvas
.
Threaded
width
:
kfrCount
>
1
?
parent
.
width
:
0
height
:
kfrCount
>
1
?
parent
.
height
:
0
opacity
:
keyframeContainer
.
selected
?
1
:
0.5
Component
{
id
:
comp
PathCurve
{
}
...
...
@@ -264,7 +266,7 @@ Rectangle
return
}
context
.
beginPath
()
context
.
fillStyle
=
Qt
.
rgba
(
0
,
0
,
0.8
,
0.
4
);
context
.
fillStyle
=
Qt
.
rgba
(
0
,
0
,
0.8
,
0.
5
);
paths
=
[]
var
xpos
var
ypos
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
c5becebd
...
...
@@ -1192,6 +1192,11 @@ void TimelineController::addEffectToCurrentClip(const QStringList &effectData)
void
TimelineController
::
adjustFade
(
int
cid
,
const
QString
&
effectId
,
int
duration
,
int
initialDuration
)
{
if
(
initialDuration
==
-
2
)
{
// Add default fade
duration
=
pCore
->
currentDoc
()
->
getFramePos
(
KdenliveSettings
::
fade_duration
());
initialDuration
=
0
;
}
if
(
duration
<=
0
)
{
// remove fade
m_model
->
removeFade
(
cid
,
effectId
==
QLatin1String
(
"fadein"
));
...
...
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