Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into swap-between-send…
Browse files Browse the repository at this point in the history
…-button-or-receive-arrow
  • Loading branch information
sakertooth committed Sep 19, 2024
2 parents 1341fed + c952d56 commit 6ee3b36
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/gui/MixerChannelView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace lmms::gui
m_soloButton->setCheckable(true);
m_soloButton->setToolTip(tr("Solo this channel"));

QVBoxLayout* soloMuteLayout = new QVBoxLayout();
auto soloMuteLayout = new QVBoxLayout();
soloMuteLayout->setContentsMargins(0, 0, 0, 0);
soloMuteLayout->setSpacing(0);
soloMuteLayout->addWidget(m_soloButton, 0, Qt::AlignHCenter);
Expand All @@ -139,14 +139,14 @@ namespace lmms::gui
m_effectRackView->setFixedWidth(EffectRackView::DEFAULT_WIDTH);

auto mainLayout = new QVBoxLayout{this};
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setSpacing(0);
mainLayout->setContentsMargins(4, 4, 4, 4);
mainLayout->setSpacing(2);
mainLayout->addWidget(m_receiveArrowOrSendButton, 0, Qt::AlignHCenter);
mainLayout->addWidget(m_sendKnob, 0, Qt::AlignHCenter);
mainLayout->addWidget(m_sendArrow, 0, Qt::AlignHCenter);
mainLayout->addWidget(m_channelNumberLcd, 0, Qt::AlignHCenter);
mainLayout->addWidget(m_renameLineEditView, 0, Qt::AlignHCenter);
mainLayout->addLayout(soloMuteLayout, 0);
mainLayout->addLayout(soloMuteLayout);
mainLayout->addWidget(m_peakIndicator);
mainLayout->addWidget(m_fader, 1, Qt::AlignHCenter);

Expand Down

0 comments on commit 6ee3b36

Please sign in to comment.