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
8d18c171
Commit
8d18c171
authored
Feb 03, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix effectstack layout margin for qtblend effect
parent
1bfec556
Pipeline
#14429
passed with stage
in 15 minutes and 10 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/keyframewidget.cpp
View file @
8d18c171
...
...
@@ -170,8 +170,8 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
connect
(
m_buttonPrevious
,
&
QAbstractButton
::
pressed
,
m_keyframeview
,
&
KeyframeView
::
slotGoToPrev
);
connect
(
m_buttonNext
,
&
QAbstractButton
::
pressed
,
m_keyframeview
,
&
KeyframeView
::
slotGoToNext
);
//m_baseHeight = m_keyframeview->height() + m_selectType->defaultWidget()->sizeHint().height();
QMargins
mrg
=
contentsMargins
();
m_baseHeight
=
m_keyframeview
->
height
()
+
m_toolbar
->
sizeHint
().
height
()
+
2
+
mrg
.
top
()
+
mrg
.
bottom
();
QMargins
mrg
=
m_lay
->
contentsMargins
();
m_baseHeight
=
m_keyframeview
->
height
()
+
m_toolbar
->
sizeHint
().
height
()
+
mrg
.
top
()
+
mrg
.
bottom
();
setFixedHeight
(
m_baseHeight
);
addParameter
(
index
);
...
...
src/ui/boolparamwidget_ui.ui
View file @
8d18c171
...
...
@@ -7,14 +7,23 @@
<x>
0
</x>
<y>
0
</y>
<width>
155
</width>
<height>
58
</height>
<height>
46
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"verticalSpacing"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"margin"
>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<property
name=
"verticalSpacing"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"1"
>
...
...
@@ -44,7 +53,7 @@
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
15
</number>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"m_labelComment"
>
...
...
src/widgets/geometrywidget.cpp
View file @
8d18c171
...
...
@@ -175,7 +175,7 @@ GeometryWidget::GeometryWidget(Monitor *monitor, QPair<int, int> range, const QR
layout
->
addLayout
(
horLayout2
);
slotUpdateGeometryRect
(
rect
);
slotAdjustRectKeyframeValue
();
setMinimumHeight
(
m_spinX
->
minimumHeight
()
+
alignButton
->
sizeHint
().
height
()
+
m_spinSize
->
minimumH
eight
());
setMinimumHeight
(
horLayout
->
sizeHint
().
height
()
+
horLayout2
->
sizeHint
().
height
()
+
alignLayout
->
sizeHint
().
h
eight
());
}
void
GeometryWidget
::
slotAdjustToSource
()
...
...
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