gui / iiowidgets: fix different color border

Signed-off-by: Andrei Popa <[email protected]>
analogdevicesinc · Nov 14, 2024 · 19b0860 · 19b0860
1 parent 94ec3c5
commit 19b0860
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/gui/src/widgets/smallprogressbar.cpp b/gui/src/widgets/smallprogressbar.cpp
@@ -60,6 +60,6 @@ void SmallProgressBar::setBarColor(QColor color)
 	setStyleSheet(style);
 }
 
-void SmallProgressBar::resetBarColor() { setBarColor(Style::getAttribute(json::theme::content_subtle)); }
+void SmallProgressBar::resetBarColor() { setBarColor(Style::getAttribute(json::theme::interactive_subtle_idle)); }
 
 #include "moc_smallprogressbar.cpp"
diff --git a/gui/style/json/Scopy.json b/gui/style/json/Scopy.json
@@ -4,7 +4,7 @@
 "interactive_subtle_idle": "#5b5b6b",
 "interactive_subtle_hover": "#535361",
 "interactive_subtle_pressed": "#4c4c59",
-"interactive_subtle_disabled": "#484854",
+"interactive_subtle_disabled": "#35353d",
 "interactive_focus": "#5D2287",
 "interactive_primary_idle": "#4A64FF",
 "interactive_primary_hover": "#697EFF",

diff --git a/gui/style/qss/properties/iiowidgets/lineEdit.qss b/gui/style/qss/properties/iiowidgets/lineEdit.qss
@@ -1,5 +1,5 @@
 QLineEdit[&&property&&=true] {
-	border: &border_width& solid &content_subtle&;
+	border: &border_width& solid &interactive_subtle_idle&;
 	border-top-left-radius: 2px;
 	border-top-right-radius: 2px;
 	border-bottom-left-radius: 0px;

diff --git a/gui/style/qss/properties/lineedit/menuLineEdit.qss b/gui/style/qss/properties/lineedit/menuLineEdit.qss
@@ -1,12 +1,11 @@
 QLineEdit[&&property&&=true] {
 	background-color: transparent;
 	color: &content_default&;
-	font-size: 15px;
+	font-size: &font_size&;
 	border: 0px solid transparent;
 	border-bottom: 1px solid &content_default&;
 	border-radius: 0;
-	padding: 2px;
-	padding-bottom: 4px;
+	padding: 0 &padding_interactive& 0 &padding_interactive&;
 }
 
 QLineEdit[&&property&&=true]:disabled {

diff --git a/iio-widgets/src/iiowidget.cpp b/iio-widgets/src/iiowidget.cpp
@@ -155,7 +155,7 @@ void IIOWidget::setDataToUIConversion(std::function<QString(QString)> func) { m_
 void IIOWidget::startTimer(QString data)
 {
 	m_lastData = data;
-	m_progressBar->setBarColor(Style::getAttribute(json::theme::interactive_primary_idle));
+	m_progressBar->setBarColor(Style::getAttribute(json::theme::interactive_subtle_idle));
 	m_progressBar->startProgress();
 }