Commit 674192e5 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1912'

parents 84910e03 c5becebd
Pipeline #13659 passed with stage
in 14 minutes and 44 seconds
This diff is collapsed.
......@@ -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
......
......@@ -1199,6 +1199,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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment