Skip to content

Restore some whitespace to the mixer channel layout #7507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sakertooth merged 5 commits into from
Sep 19, 2024
Merged

Restore some whitespace to the mixer channel layout #7507

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dd6417
Set the spacing to 3 and the margins to 3
sakertooth Sep 18, 2024
b7d8b15
Remove solo/mute layout
sakertooth Sep 18, 2024
67b3027
Revert "Remove solo/mute layout"
sakertooth Sep 19, 2024
0fc559f
Set spacing to 2, horizontal margins to 4, and vertical margins equal…
sakertooth Sep 19, 2024
a23a524
Final adjustments
sakertooth Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/gui/MixerChannelView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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 @@ -128,15 +128,16 @@ 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_receiveArrow, 0, Qt::AlignHCenter);
mainLayout->addWidget(m_sendButton, 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