Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
2526f7af
Commit
2526f7af
authored
Aug 24, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Effect Stack: focus active effect when switching between clips
parent
7466caef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
3 deletions
+22
-3
src/assets/assetpanel.cpp
src/assets/assetpanel.cpp
+8
-0
src/assets/assetpanel.hpp
src/assets/assetpanel.hpp
+2
-0
src/effects/effectstack/view/effectstackview.cpp
src/effects/effectstack/view/effectstackview.cpp
+10
-3
src/effects/effectstack/view/effectstackview.hpp
src/effects/effectstack/view/effectstackview.hpp
+2
-0
No files found.
src/assets/assetpanel.cpp
View file @
2526f7af
...
...
@@ -138,6 +138,7 @@ AssetPanel::AssetPanel(QWidget *parent)
m_effectStackWidget
->
setVisible
(
false
);
updatePalette
();
connect
(
m_effectStackWidget
,
&
EffectStackView
::
checkScrollBar
,
this
,
&
AssetPanel
::
slotCheckWheelEventFilter
);
connect
(
m_effectStackWidget
,
&
EffectStackView
::
scrollView
,
this
,
&
AssetPanel
::
scrollTo
);
connect
(
m_effectStackWidget
,
&
EffectStackView
::
seekToPos
,
this
,
&
AssetPanel
::
seekToPos
);
connect
(
m_effectStackWidget
,
&
EffectStackView
::
reloadEffect
,
this
,
&
AssetPanel
::
reloadEffect
);
connect
(
m_transitionWidget
,
&
TransitionStackView
::
seekToTransPos
,
this
,
&
AssetPanel
::
seekToPos
);
...
...
@@ -405,6 +406,13 @@ void AssetPanel::collapseCurrentEffect()
}
}
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
());
}
void
AssetPanel
::
slotCheckWheelEventFilter
()
{
// If the effect stack widget has no scrollbar, we will not filter the
...
...
src/assets/assetpanel.hpp
View file @
2526f7af
...
...
@@ -104,6 +104,8 @@ private slots:
void
showKeyframes
(
bool
enable
);
/** Enable / disable effect stack */
void
enableStack
(
bool
enable
);
/** Scroll effects view */
void
scrollTo
(
QRect
rect
);
signals:
void
doSplitEffect
(
bool
);
...
...
src/effects/effectstack/view/effectstackview.cpp
View file @
2526f7af
...
...
@@ -107,7 +107,9 @@ EffectStackView::EffectStackView(AssetPanel *parent)
m_scrollTimer
.
setSingleShot
(
true
);
m_scrollTimer
.
setInterval
(
250
);
connect
(
&
m_scrollTimer
,
&
QTimer
::
timeout
,
this
,
&
EffectStackView
::
checkScrollBar
);
m_timerHeight
.
setSingleShot
(
true
);
m_timerHeight
.
setInterval
(
50
);
}
EffectStackView
::~
EffectStackView
()
...
...
@@ -184,6 +186,7 @@ void EffectStackView::dropEvent(QDropEvent *event)
void
EffectStackView
::
setModel
(
std
::
shared_ptr
<
EffectStackModel
>
model
,
const
QSize
frameSize
)
{
qDebug
()
<<
"MUTEX LOCK!!!!!!!!!!!! setmodel"
;
disconnect
(
&
m_timerHeight
,
&
QTimer
::
timeout
,
this
,
&
EffectStackView
::
updateTreeHeight
);
m_mutex
.
lock
();
unsetModel
(
false
);
m_model
=
std
::
move
(
model
);
...
...
@@ -227,8 +230,10 @@ void EffectStackView::loadEffects()
// blank stack
ObjectId
item
=
m_model
->
getOwnerId
();
pCore
->
getMonitor
(
item
.
first
==
ObjectType
::
BinClip
?
Kdenlive
::
ClipMonitor
:
Kdenlive
::
ProjectMonitor
)
->
slotShowEffectScene
(
MonitorSceneDefault
);
updateTreeHeight
();
return
;
}
connect
(
&
m_timerHeight
,
&
QTimer
::
timeout
,
this
,
&
EffectStackView
::
updateTreeHeight
);
int
active
=
qBound
(
0
,
m_model
->
getActiveEffect
(),
max
-
1
);
QModelIndex
activeIndex
;
for
(
int
i
=
0
;
i
<
max
;
i
++
)
{
...
...
@@ -266,9 +271,9 @@ void EffectStackView::loadEffects()
view
->
buttonDown
->
setEnabled
(
i
<
max
-
1
);
if
(
i
==
active
)
{
activeIndex
=
ix
;
m_effectsTree
->
setCurrentIndex
(
activeIndex
);
}
}
updateTreeHeight
();
if
(
activeIndex
.
isValid
())
{
doActivateEffect
(
active
,
activeIndex
,
true
);
}
...
...
@@ -293,6 +298,7 @@ void EffectStackView::updateTreeHeight()
}
}
m_effectsTree
->
setFixedHeight
(
totalHeight
);
emit
scrollView
(
m_effectsTree
->
visualRect
(
m_effectsTree
->
currentIndex
()));
m_scrollTimer
.
start
();
}
...
...
@@ -338,7 +344,7 @@ void EffectStackView::slotAdjustDelegate(const std::shared_ptr<EffectItemModel>
auto
*
del
=
static_cast
<
WidgetDelegate
*>
(
m_effectsTree
->
itemDelegate
(
ix
));
if
(
del
)
{
del
->
setHeight
(
ix
,
newHeight
);
QMetaObject
::
invokeMethod
(
this
,
"updateTreeHeight"
,
Qt
::
QueuedConnection
);
m_timerHeight
.
start
(
);
}
}
}
...
...
@@ -450,6 +456,7 @@ void EffectStackView::doActivateEffect(int row, QModelIndex activeIx, bool force
}
}
}
m_effectsTree
->
setCurrentIndex
(
activeIx
);
m_model
->
setActiveEffect
(
row
);
CollapsibleEffectView
*
w
=
static_cast
<
CollapsibleEffectView
*>
(
m_effectsTree
->
indexWidget
(
activeIx
));
if
(
w
)
{
...
...
src/effects/effectstack/view/effectstackview.hpp
View file @
2526f7af
...
...
@@ -91,6 +91,7 @@ private:
std
::
vector
<
CollapsibleEffectView
*>
m_widgets
;
AssetIconProvider
*
m_thumbnailer
;
QTimer
m_scrollTimer
;
QTimer
m_timerHeight
;
/** @brief the frame size of the original clip this effect is applied on
*/
...
...
@@ -122,6 +123,7 @@ signals:
void
removeCurrentEffect
();
void
blockWheenEvent
(
bool
block
);
void
checkScrollBar
();
void
scrollView
(
QRect
);
};
#endif
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