Skip to content

Commit 5a6d5de

Browse files
committed
gui: menuspinbox: added large widget mode
- spinboxes in debugger are now smaller Signed-off-by: Andrei Popa <andrei.popa@analog.com>
1 parent cb9381a commit 5a6d5de

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

gui/include/gui/widgets/menuspinbox.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class SCOPY_GUI_EXPORT MenuSpinbox : public QWidget
149149
} IncrementMode;
150150

151151
MenuSpinbox(QString name, double val, QString unit, double min, double max, bool vertical = 0, bool left = 0,
152-
QWidget *parent = nullptr);
152+
bool large_widget = true, QWidget *parent = nullptr);
153153
~MenuSpinbox();
154154

155155
double value() const;
@@ -203,6 +203,7 @@ private Q_SLOTS:
203203
double m_value, m_min, m_max;
204204
double m_scaleMin, m_scaleMax;
205205
QString m_unit;
206+
bool m_large_widget;
206207

207208
QList<UnitPrefix> m_scales;
208209
// QMap<QString, double> m_scaleMap;

gui/src/widgets/menuspinbox.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ namespace scopy {
2727
namespace gui {
2828

2929
MenuSpinbox::MenuSpinbox(QString name, double val, QString unit, double min, double max, bool vertical, bool left,
30-
QWidget *parent)
30+
bool large_widget, QWidget *parent)
3131
: QWidget(parent)
3232
{
33-
33+
m_large_widget = large_widget;
3434
m_label = new QLabel(name, parent);
3535
m_edit = new QLineEdit("0", parent);
3636
m_scaleCb = new QComboBox(parent);
@@ -121,17 +121,23 @@ void MenuSpinbox::layoutVertically(bool left)
121121
lay->addLayout(btnLay);
122122
}
123123

124-
Style::setStyle(m_label, style::properties::label::subtle);
125124
Style::setStyle(m_scaleCb, style::properties::widget::noBorder);
125+
int size = m_large_widget ? Style::getDimension(json::global::unit_2_5)
126+
: Style::getDimension(json::global::unit_1);
126127

127-
int size = Style::getDimension(json::global::unit_2_5);
128128
m_plus->setIcon(Style::getPixmap(":/gui/icons/plus.svg", Style::getColor(json::theme::content_inverse)));
129129
Style::setStyle(m_plus, style::properties::button::spinboxButton);
130130
m_plus->setFixedSize(size, size);
131131

132132
m_minus->setIcon(Style::getPixmap(":/gui/icons/minus.svg", Style::getColor(json::theme::content_inverse)));
133133
Style::setStyle(m_minus, style::properties::button::spinboxButton);
134134
m_minus->setFixedSize(size, size);
135+
136+
if(!m_large_widget) {
137+
int icon_size = Style::getDimension(json::global::unit_0_5);
138+
m_plus->setIconSize(QSize(icon_size, icon_size));
139+
m_minus->setIconSize(QSize(icon_size, icon_size));
140+
}
135141
}
136142

137143
void MenuSpinbox::layoutHorizontally(bool left)

iio-widgets/src/guistrategy/rangeguistrategy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RangeAttrUi::RangeAttrUi(IIOWidgetFactoryRecipe recipe, bool isCompact, QWidget
3838
m_ui->setLayout(new QVBoxLayout(m_ui));
3939
m_ui->layout()->setContentsMargins(0, 0, 0, 0);
4040

41-
m_spinBox = new gui::MenuSpinbox(m_recipe.data.toUpper(), 0, "", 0, 1, true, false, m_ui);
41+
m_spinBox = new gui::MenuSpinbox(m_recipe.data.toUpper(), 0, "", 0, 1, true, false, false, m_ui);
4242
m_spinBox->setIncrementMode(gui::MenuSpinbox::IS_FIXED);
4343
m_spinBox->setScaleRange(1, 1);
4444
m_spinBox->setScalingEnabled(false);

0 commit comments

Comments
 (0)