Skip to content
GitLab
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
ae4ea739
Commit
ae4ea739
authored
Sep 19, 2021
by
Julius Künzel
💬
Browse files
Merge branch 'refs/heads/release/21.08'
parents
a3e21feb
807cf558
Changes
2
Hide whitespace changes
Inline
Side-by-side
data/transitions/composite.xml
View file @
ae4ea739
...
...
@@ -6,11 +6,23 @@
<parameter
type=
"animatedrect"
name=
"geometry"
default=
"0 0 %width %height 100"
>
<name>
Rectangle
</name>
</parameter>
<parameter
type=
"bool"
name=
"aligned"
default=
"0"
min=
"0"
max=
"1"
>
<parameter
type=
"bool"
name=
"distort"
default=
"0"
min=
"0"
max=
"1"
>
<name>
Distort
</name>
<description>
When set, causes the B frame image to fill the WxH completely with no regard to B's aspect ratio.
</description>
</parameter>
<parameter
type=
"bool"
name=
"crop_to_fill"
default=
"0"
min=
"0"
max=
"1"
>
<name>
Crop to fill
</name>
</parameter>
<parameter
type=
"bool"
name=
"aligned"
default=
"1"
min=
"0"
max=
"1"
>
<name>
Align
</name>
</parameter>
<parameter
type=
"bool"
name=
"progressive"
default=
"1"
min=
"0"
max=
"1"
>
<name>
Force Progressive Rendering
</name>
<parameter
type=
"list"
name=
"halign"
default=
"1"
paramlist=
"0;1;2"
>
<paramlistdisplay>
Left,Center,Right
</paramlistdisplay>
<name>
H align
</name>
</parameter>
<parameter
type=
"list"
name=
"valign"
default=
"1"
paramlist=
"0;1;2"
>
<paramlistdisplay>
Top,Middle,Bottom
</paramlistdisplay>
<name>
V align
</name>
</parameter>
<parameter
type=
"urllist"
name=
"luma"
paramlist=
"%lumaPaths"
filter=
"Luma files (*.png *.pgm)"
newstuff=
":data/kdenlive_wipes.knsrc"
optional=
"1"
>
<name>
Composite Method
</name>
...
...
@@ -18,4 +30,7 @@
<parameter
type=
"double"
name=
"softness"
max=
"100"
min=
"0"
default=
"0"
factor=
"100"
>
<name>
Softness
</name>
</parameter>
<parameter
type=
"bool"
name=
"progressive"
default=
"1"
min=
"0"
max=
"1"
>
<name>
Force Progressive Rendering
</name>
</parameter>
</transition>
src/timeline2/model/timelinefunctions.cpp
View file @
ae4ea739
...
...
@@ -1086,7 +1086,9 @@ QStringList TimelineFunctions::enableMultitrackView(const std::shared_ptr<Timeli
transition
.
set
(
"a_track"
,
0
);
transition
.
set
(
"b_track"
,
b_track
);
transition
.
set
(
"distort"
,
0
);
transition
.
set
(
"aligned"
,
0
);
transition
.
set
(
"aligned"
,
1
);
transition
.
set
(
"halign"
,
1
);
transition
.
set
(
"valign"
,
1
);
// 200 is an arbitrary number so we can easily remove these transition later
transition
.
set
(
"internal_added"
,
200
);
QString
geometry
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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