From 53cc11ac58d87b75b2fd94d68a08ecd690a18ed2 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Fri, 19 Nov 2021 18:47:39 -0600 Subject: [PATCH] adjusted layout of side bar to center slider (#2093) --- src/widgets/panel/sidepanelwidget.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/widgets/panel/sidepanelwidget.cpp b/src/widgets/panel/sidepanelwidget.cpp index 22ab0b21..ccd72220 100644 --- a/src/widgets/panel/sidepanelwidget.cpp +++ b/src/widgets/panel/sidepanelwidget.cpp @@ -30,17 +30,31 @@ SidePanelWidget::SidePanelWidget(QPixmap* p, QWidget* parent) parent->installEventFilter(this); } - QFormLayout* colorForm = new QFormLayout(); - colorForm->setRowWrapPolicy(QFormLayout::WrapLongRows); + QGridLayout* colorLayout = new QGridLayout(); + + // Create Active Tool Size + QLabel* activeToolSizeText = new QLabel(tr("Active tool size: ")); + m_toolSizeSlider = new QSlider(Qt::Horizontal); m_toolSizeSlider->setRange(1, maxToolSize); m_toolSizeSlider->setValue(m_toolSize); m_toolSizeSlider->setMinimumWidth(minSliderWidth); + + colorLayout->addWidget(activeToolSizeText, 0, 0); + colorLayout->addWidget(m_toolSizeSlider, 1, 0); + + // Create Active Color + QHBoxLayout* colorHBox = new QHBoxLayout(); + QLabel* colorText = new QLabel(tr("Active Color: ")); + m_colorLabel = new QLabel(); m_colorLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - colorForm->addRow(tr("Active tool size:"), m_toolSizeSlider); - colorForm->addRow(tr("Active color:"), m_colorLabel); - m_layout->addLayout(colorForm); + + colorHBox->addWidget(colorText); + colorHBox->addWidget(m_colorLabel); + colorLayout->addLayout(colorHBox, 2, 0); + + m_layout->addLayout(colorLayout); m_colorWheel = new color_widgets::ColorWheel(this); m_colorWheel->setColor(m_color);