Skip to content

GitLab

Commit cec96646 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix reverse wipes. 

Related to #1116
parent 6f7df8c3
Show whitespace changes
Inline Side-by-side
data/transitions/wipe.xml
View file @ cec96646
......@@ -12,7 +12,7 @@
<parameter type="bool" name="luma_invert" max="1" min="0" default="0">
<name>Invert</name>
</parameter>
<parameter type="switch" name="geometry" max="0=0% 0% 100% 100% 1;-1=0% 0% 100% 100% 0" min="0=0% 0% 100% 100% 0;-1=0% 0% 100% 100% 1" default="0=0% 0% 100% 100% 0;-1=0% 0% 100% 100% 1">
<parameter type="switch" name="geometry" max="0=0% 0% 100% 100% 100%;-1=0% 0% 100% 100% 0%" min="0=0% 0% 100% 100% 0%;-1=0% 0% 100% 100% 100%" default="0=0% 0% 100% 100% 0%;-1=0% 0% 100% 100% 100%">
<name>Revert</name>
</parameter>
<parameter type="fixed" name="aligned" value="0" />
......
src/doc/documentvalidator.cpp
View file @ cec96646
......@@ -1752,9 +1752,9 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
if (Xml::getXmlProperty(t, QStringLiteral("kdenlive_id")) == QLatin1String("wipe")) {
QString animation = Xml::getXmlProperty(t, QStringLiteral("geometry"));
if (animation == QLatin1String("0%/0%:100%x100%:100;-1=0%/0%:100%x100%:0")) {
Xml::setXmlProperty(t, QStringLiteral("geometry"), QStringLiteral("0=0% 0% 100% 100% 1;-1=0% 0% 100% 100% 0"));
Xml::setXmlProperty(t, QStringLiteral("geometry"), QStringLiteral("0=0% 0% 100% 100% 100%;-1=0% 0% 100% 100% 0%"));
} else if (animation == QLatin1String("0%/0%:100%x100%:0;-1=0%/0%:100%x100%:100")) {
Xml::setXmlProperty(t, QStringLiteral("geometry"), QStringLiteral("0=0% 0% 100% 100% 0;-1=0% 0% 100% 100% 1"));
Xml::setXmlProperty(t, QStringLiteral("geometry"), QStringLiteral("0=0% 0% 100% 100% 0%;-1=0% 0% 100% 100% 100%"));
}
}
}
......
src/timeline2/view/timelinecontroller.cpp
View file @ cec96646
......@@ -479,7 +479,7 @@ int TimelineController::insertNewComposition(int tid, int clipId, int offset, co
} else if (transitionId == QLatin1String("composite") || transitionId == QLatin1String("slide")) {
props->set("invert", 1);
} else if (transitionId == QLatin1String("wipe")) {
props->set("geometry", "0%/0%:100%x100%:100;-1=0%/0%:100%x100%:0");
props->set("geometry", "0=0% 0% 100% 100% 100%;-1=0% 0% 100% 100% 0%");
}
}
if (!m_model->requestCompositionInsertion(transitionId, tid, position, duration, std::move(props), id, logUndo)) {
......
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