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
f1aae681
Commit
f1aae681
authored
Dec 01, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix geometry effects like obscure regression.
Fixes
#856
parent
9194ffee
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/geometryeditwidget.cpp
View file @
f1aae681
...
...
@@ -52,6 +52,11 @@ GeometryEditWidget::GeometryEditWidget(std::shared_ptr<AssetParameterModel> mode
m_geom
=
new
GeometryWidget
(
monitor
,
QPair
<
int
,
int
>
(
start
,
end
),
rect
,
100
,
frameSize
,
false
,
m_model
->
data
(
m_index
,
AssetParameterModel
::
OpacityRole
).
toBool
(),
true
,
this
);
m_geom
->
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
MinimumExpanding
,
QSizePolicy
::
Preferred
));
connect
(
m_geom
,
&
GeometryWidget
::
updateMonitorGeometry
,
[
this
](
const
QRect
r
)
{
if
(
m_model
->
isActive
())
{
pCore
->
getMonitor
(
m_model
->
monitorId
)
->
setUpEffectGeometry
(
r
);
}
});
layout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
layout
->
addWidget
(
m_geom
);
setFixedHeight
(
m_geom
->
sizeHint
().
height
());
...
...
src/assets/view/widgets/keyframewidget.cpp
View file @
f1aae681
...
...
@@ -354,7 +354,7 @@ void KeyframeWidget::addParameter(const QPersistentModelIndex &index)
this
,
[
this
,
index
](
const
QString
v
)
{
emit
activateEffect
();
m_keyframes
->
updateKeyframe
(
GenTime
(
getPosition
(),
pCore
->
getCurrentFps
()),
QVariant
(
v
),
index
);
});
connect
(
geomWidget
,
&
GeometryWidget
::
updateMonitorGeometry
,
[
this
,
index
](
const
QRect
r
)
{
connect
(
geomWidget
,
&
GeometryWidget
::
updateMonitorGeometry
,
[
this
](
const
QRect
r
)
{
if
(
m_model
->
isActive
())
{
pCore
->
getMonitor
(
m_model
->
monitorId
)
->
setUpEffectGeometry
(
r
);
}
...
...
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