Reduce spacing between macro segments

This commit is contained in:
WarmUpTill 2022-02-02 20:29:45 +01:00 committed by WarmUpTill
parent 262bb3f1ee
commit 08a8157f3a
4 changed files with 12 additions and 18 deletions

View File

@ -858,14 +858,7 @@
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="macroEditConditionLayout">
<property name="spacing">
<number>1</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
</layout>
<layout class="QVBoxLayout" name="macroEditConditionLayout"/>
</item>
</layout>
</item>
@ -970,14 +963,7 @@
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="macroEditActionLayout">
<property name="spacing">
<number>1</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
</layout>
<layout class="QVBoxLayout" name="macroEditActionLayout"/>
</item>
</layout>
</item>

View File

@ -79,10 +79,13 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
_section->AddHeaderWidget(_headerInfo);
QVBoxLayout *actionLayout = new QVBoxLayout;
actionLayout->setContentsMargins(0, 0, 0, 0);
actionLayout->setSpacing(0);
actionLayout->addWidget(_frame);
_highLightFrameLayout->addWidget(_section);
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->setContentsMargins(0, 0, 0, 0);
if (switcher->useVerticalMacroControls) {
mainLayout->addWidget(_controls);
} else {

View File

@ -123,10 +123,13 @@ MacroConditionEdit::MacroConditionEdit(
_section->AddHeaderWidget(_dur);
QVBoxLayout *conditionLayout = new QVBoxLayout;
conditionLayout->setContentsMargins(0, 0, 0, 0);
conditionLayout->setSpacing(0);
conditionLayout->addWidget(_frame);
_highLightFrameLayout->addWidget(_section);
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->setContentsMargins(0, 0, 0, 0);
if (switcher->useVerticalMacroControls) {
mainLayout->addWidget(_controls);
} else {

View File

@ -57,7 +57,10 @@ MacroEntryControls::MacroEntryControls(bool vertical,
mainLayout->addWidget(_down);
mainLayout->addWidget(line);
mainLayout->setContentsMargins(0, 0, 0, 0);
// Save as much space as possible but leave a bit of distance
// to the widget being controlled
mainLayout->setContentsMargins(0, 3, 0, 0);
setLayout(mainLayout);
_animation = new QPropertyAnimation(this, "maximumHeight");
@ -66,7 +69,6 @@ MacroEntryControls::MacroEntryControls(bool vertical,
_animation->setEndValue(mainLayout->sizeHint().height());
setMaximumHeight(0);
setLayout(mainLayout);
}
connect(_add, &QPushButton::clicked, this, &MacroEntryControls::Add);