Skip to content

Commit 805a10f

Browse files
andrei47wAlexandraTrifan
authored andcommitted
Debugger: minor attributes section style adjustments
- tab widget style changes Signed-off-by: Andrei Popa <andrei.popa@analog.com>
1 parent c45fbca commit 805a10f

File tree

9 files changed

+16
-21
lines changed

9 files changed

+16
-21
lines changed

gui/src/widgets/menucombo.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121

2222
#include <QVBoxLayout>
23+
#include <style.h>
2324

2425
#include <widgets/menucombo.h>
2526

@@ -56,6 +57,8 @@ MenuCombo::MenuCombo(QString title, QWidget *parent)
5657
lay->setMargin(0);
5758

5859
m_label = new QLabel(title, this);
60+
Style::setStyle(m_label, style::properties::label::subtle);
61+
5962
m_combo = new QComboBox(this);
6063

6164
lay->addWidget(m_label);

gui/src/widgets/menuspinbox.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ MenuSpinbox::MenuSpinbox(QString name, double val, QString unit, double min, dou
3232
{
3333
m_large_widget = large_widget;
3434
m_label = new QLabel(name, parent);
35+
Style::setStyle(m_label, style::properties::label::subtle);
36+
3537
m_edit = new QLineEdit("0", parent);
3638
m_scaleCb = new QComboBox(parent);
3739
m_plus = new QPushButton("", parent);
@@ -91,7 +93,7 @@ void MenuSpinbox::layoutVertically(bool left)
9193
auto lay = new QHBoxLayout(this);
9294
setLayout(lay);
9395

94-
lay->setSpacing(5);
96+
lay->setSpacing(0);
9597
lay->setMargin(0);
9698

9799
QLayout *btnLay;
@@ -101,7 +103,7 @@ void MenuSpinbox::layoutVertically(bool left)
101103
editLay = new QVBoxLayout();
102104

103105
btnLay->setSpacing(2);
104-
btnLay->setMargin(0);
106+
btnLay->setContentsMargins(5, 0, 0, 0);
105107
editLay->setSpacing(2);
106108
editLay->setMargin(0);
107109

gui/style/json/Harmonic light.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"interactive_subtle_idle": "#848B95",
55
"interactive_subtle_hover": "#5E6773",
66
"interactive_subtle_pressed": "#4b525c",
7-
"interactive_subtle_disabled": "#c1c3c7",
7+
"interactive_subtle_disabled": "#d5d7db",
88
"interactive_focus": "#F6EEFC",
99
"interactive_primary_idle": "#0067B9",
1010
"interactive_primary_hover": "#00427A",
@@ -13,7 +13,7 @@
1313
"interactive_secondary_idle": "#0067B9",
1414
"interactive_secondary_hover": "#00427A",
1515
"interactive_secondary_pressed": "#003969",
16-
"interactive_secondary_disabled": "#c1c3c7",
16+
"interactive_secondary_disabled": "#d5d7db",
1717
"content_default": "#101820",
1818
"content_subtle": "#5E6773",
1919
"content_silent": "#9FA4AD",

gui/style/qss/generic/global.qss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ QTabBar::tab {
204204
}
205205

206206
QTabBar::tab:selected {
207-
background: &background_primary&;
208-
color: &interactive_primary_idle&;
207+
background: &interactive_subtle_disabled&;
208+
color: &content_default&;
209209
border-bottom: 1px solid &interactive_primary_idle&;
210210
}
211211

gui/style/qss/properties/label/iioCompactLabel.qss

Lines changed: 0 additions & 12 deletions
This file was deleted.

iio-widgets/src/guistrategy/comboguistrategy.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ ComboAttrUi::ComboAttrUi(IIOWidgetFactoryRecipe recipe, bool isCompact, QWidget
3737
m_ui->layout()->setContentsMargins(0, 0, 0, 0);
3838

3939
auto label = new QLabel(recipe.data, m_ui);
40-
Style::setStyle(label, style::properties::label::iioCompactLabel);
4140
m_comboWidget = new QComboBox(m_ui);
4241
m_comboWidget->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
4342

iio-widgets/src/guistrategy/editableguistrategy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ EditableGuiStrategy::EditableGuiStrategy(IIOWidgetFactoryRecipe recipe, bool isC
3333

3434
if(isCompact) {
3535
m_ui->setLayout(new QHBoxLayout(m_ui));
36-
Style::setStyle(label, style::properties::label::iioCompactLabel);
3736
m_lineEdit->edit()->setAlignment(Qt::AlignRight);
3837
} else {
38+
Style::setStyle(label, style::properties::label::subtle);
3939
m_ui->setLayout(new QVBoxLayout(m_ui));
4040
}
4141

@@ -44,6 +44,7 @@ EditableGuiStrategy::EditableGuiStrategy(IIOWidgetFactoryRecipe recipe, bool isC
4444
m_ui->layout()->setContentsMargins(0, 0, 0, 0);
4545
m_ui->layout()->addWidget(label);
4646
m_ui->layout()->addWidget(m_lineEdit);
47+
m_ui->layout()->setSpacing(0);
4748

4849
connect(m_lineEdit->edit(), &QLineEdit::editingFinished, this, [this]() {
4950
QString currentText = m_lineEdit->edit()->text();

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, false, m_ui);
41+
m_spinBox = new gui::MenuSpinbox(m_recipe.data, 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);

plugins/debugger/src/iioexplorer/guidetailsview.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121

2222
#include "guidetailsview.h"
23+
#include "style.h"
2324

2425
using namespace scopy::debugger;
2526

@@ -41,6 +42,7 @@ void GuiDetailsView::setupUi()
4142
m_scrollAreaContents->setLayout(new QVBoxLayout(m_scrollAreaContents));
4243
m_scrollAreaContents->setObjectName("DetailsViewScrollAreaContents");
4344
m_scrollAreaContents->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
45+
m_scrollAreaContents->layout()->setSpacing(Style::getDimension(json::global::unit_1));
4446

4547
m_scrollArea->setWidgetResizable(true);
4648
m_scrollArea->setWidget(m_scrollAreaContents);

0 commit comments

Comments
 (0)