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
586f8a74
Commit
586f8a74
authored
Nov 01, 2019
by
Jean-Baptiste Mardelle
Browse files
Disable effect split view if timeline clip was moved
parent
62b0decf
Pipeline
#9836
passed with stage
in 13 minutes and 21 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/assetpanel.cpp
View file @
586f8a74
...
...
@@ -159,7 +159,6 @@ void AssetPanel::showTransition(int tid, const std::shared_ptr<AssetParameterMod
void
AssetPanel
::
showEffectStack
(
const
QString
&
itemName
,
const
std
::
shared_ptr
<
EffectStackModel
>
&
effectsModel
,
QSize
frameSize
,
bool
showKeyframes
)
{
m_splitButton
->
setActive
(
false
);
if
(
effectsModel
==
nullptr
)
{
// Item is not ready
m_splitButton
->
setVisible
(
false
);
...
...
@@ -170,6 +169,11 @@ void AssetPanel::showEffectStack(const QString &itemName, const std::shared_ptr<
ObjectId
id
=
effectsModel
->
getOwnerId
();
if
(
m_effectStackWidget
->
stackOwner
()
==
id
)
{
// already on this effect stack, do nothing
// Disable split effect in case clip was moved
if
(
id
.
first
==
ObjectType
::
TimelineClip
&&
m_splitButton
->
isActive
())
{
m_splitButton
->
setActive
(
false
);
processSplitEffect
(
false
);
}
return
;
}
clear
();
...
...
@@ -236,6 +240,10 @@ void AssetPanel::clearAssetPanel(int itemId)
void
AssetPanel
::
clear
()
{
if
(
m_splitButton
->
isActive
())
{
m_splitButton
->
setActive
(
false
);
processSplitEffect
(
false
);
}
m_switchAction
->
setVisible
(
false
);
m_transitionWidget
->
setVisible
(
false
);
m_transitionWidget
->
unsetModel
();
...
...
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