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
75063593
Commit
75063593
authored
Nov 28, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix active effect not remembered and not correctly focused.
Fixes
#854
parent
a6e6e11f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/assets/assetpanel.cpp
View file @
75063593
...
...
@@ -451,7 +451,11 @@ void AssetPanel::scrollTo(QRect rect)
{
// Ensure the scrollview widget adapted its height to the effectstackview height change
m_sc
->
widget
()
->
adjustSize
();
m_sc
->
ensureVisible
(
0
,
rect
.
y
(),
0
,
rect
.
height
());
if
(
rect
.
height
()
<
m_sc
->
height
())
{
m_sc
->
ensureVisible
(
0
,
rect
.
y
()
+
rect
.
height
(),
0
,
0
);
}
else
{
m_sc
->
ensureVisible
(
0
,
rect
.
y
()
+
m_sc
->
height
(),
0
,
0
);
}
}
void
AssetPanel
::
slotCheckWheelEventFilter
()
...
...
src/timeline2/model/clipmodel.cpp
View file @
75063593
...
...
@@ -478,9 +478,13 @@ void ClipModel::refreshProducerFromBin(int trackId, PlaylistState::ClipState sta
m_producer
->
parent
().
set
(
"warp_pitch"
,
0
);
}
// replant effect stack in updated service
int
activeEffect
=
m_effectStack
->
getActiveEffect
();
m_effectStack
->
resetService
(
m_producer
);
m_producer
->
set
(
"kdenlive:id"
,
binClip
->
clipId
().
toUtf8
().
constData
());
m_producer
->
set
(
"_kdenlive_cid"
,
m_id
);
if
(
activeEffect
>
0
)
{
m_producer
->
set
(
"kdenlive:activeeffect"
,
activeEffect
);
}
m_endlessResize
=
!
binClip
->
hasLimitedDuration
();
}
...
...
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