From 727992f1d03307612cc75dfd794c89fafe65bd58 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sun, 30 Jan 2022 03:37:12 +0100
Subject: [PATCH] Clean up stylesheet usage

---
 src/headers/utility.hpp |  3 +--
 src/macro-tab.cpp       |  6 ++----
 src/section.cpp         |  4 +++-
 src/status-control.cpp  |  8 +++++++-
 src/switch-random.cpp   |  8 +++++++-
 src/utility.cpp         | 10 +---------
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp
index 2c7d6d32..bdbc40f1 100644
--- a/src/headers/utility.hpp
+++ b/src/headers/utility.hpp
@@ -47,8 +47,7 @@ void deleteLayoutItem(QLayoutItem *item);
 void clearLayout(QLayout *layout, int afterIdx = 0);
 void setLayoutVisible(QLayout *layout, bool visible);
 QMetaObject::Connection PulseWidget(QWidget *widget, QColor startColor,
-				    QColor = QColor(0, 0, 0, 0),
-				    QString specifier = "QLabel ",
+				    QColor endColor = QColor(0, 0, 0, 0),
 				    bool once = false);
 void listAddClicked(QListWidget *list, QWidget *newWidget,
 		    QPushButton *addButton = nullptr,
diff --git a/src/macro-tab.cpp b/src/macro-tab.cpp
index 4f34962a..4d4dd815 100644
--- a/src/macro-tab.cpp
+++ b/src/macro-tab.cpp
@@ -265,8 +265,7 @@ void AdvSceneSwitcher::HighlightAction(int idx)
 	if (!widget) {
 		return;
 	}
-	PulseWidget(widget, QColor(Qt::green), QColor(0, 0, 0, 0), "QLabel ",
-		    true);
+	PulseWidget(widget, QColor(Qt::green), QColor(0, 0, 0, 0), true);
 }
 
 void AdvSceneSwitcher::HighlightCondition(int idx)
@@ -279,8 +278,7 @@ void AdvSceneSwitcher::HighlightCondition(int idx)
 	if (!widget) {
 		return;
 	}
-	PulseWidget(widget, QColor(Qt::green), QColor(0, 0, 0, 0), "QLabel ",
-		    true);
+	PulseWidget(widget, QColor(Qt::green), QColor(0, 0, 0, 0), true);
 }
 
 void AdvSceneSwitcher::ConnectControlSignals(MacroActionEdit *c)
diff --git a/src/section.cpp b/src/section.cpp
index 162f780c..dfd648f7 100644
--- a/src/section.cpp
+++ b/src/section.cpp
@@ -59,8 +59,10 @@ void Section::SetContent(QWidget *w, bool collapsed)
 
 	// Setup contentArea
 	_contentArea = new QScrollArea(this);
+	_contentArea->setObjectName("macroSegmentContent");
 	_contentArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-	_contentArea->setStyleSheet("QScrollArea { border: none; }");
+	_contentArea->setStyleSheet(
+		"#macroSegmentContent { border: none; background-color: rgba(0,0,0,0); }");
 	_contentArea->setMaximumHeight(0);
 	_contentArea->setMinimumHeight(0);
 
diff --git a/src/status-control.cpp b/src/status-control.cpp
index 1ba20a20..22114d7a 100644
--- a/src/status-control.cpp
+++ b/src/status-control.cpp
@@ -13,6 +13,12 @@ StatusControl::StatusControl(QWidget *parent, bool noLayout) : QWidget(parent)
 {
 	_button = new QPushButton("-", this);
 	_status = new QLabel("-", this);
+	_status->setStyleSheet("QLabel{ \
+		border-style: outset; \
+		border-width: 2px; \
+		border-radius: 7px; \
+		border-color: rgb(0,0,0,0) \
+		}");
 	_statusPrefix = new QLabel(
 		obs_module_text(
 			"AdvSceneSwitcher.generalTab.status.currentStatus"),
@@ -87,7 +93,7 @@ void StatusControl::SetStopped()
 	_status->setText(obs_module_text("AdvSceneSwitcher.status.inactive"));
 	if (!switcher->disableHints) {
 		_pulse = PulseWidget(_status, QColor(Qt::red),
-				     QColor(0, 0, 0, 0), "QLabel ");
+				     QColor(0, 0, 0, 0));
 	}
 	_setToStopped = true;
 }
diff --git a/src/switch-random.cpp b/src/switch-random.cpp
index b45f1790..87c779de 100644
--- a/src/switch-random.cpp
+++ b/src/switch-random.cpp
@@ -134,10 +134,16 @@ void AdvSceneSwitcher::setupRandomTab()
 		ui->randomHelp->setVisible(false);
 	}
 
+	ui->randomDisabledWarning->setStyleSheet("QLabel{ \
+		border-style: outset; \
+		border-width: 2px; \
+		border-radius: 7px; \
+		border-color: rgb(0,0,0,0) \
+		}");
 	if (switcher->switchIfNotMatching != RANDOM_SWITCH) {
 		if (!switcher->disableHints) {
 			PulseWidget(ui->randomDisabledWarning, QColor(Qt::red),
-				    QColor(0, 0, 0, 0), "QLabel ");
+				    QColor(0, 0, 0, 0));
 		}
 	} else {
 		ui->randomDisabledWarning->setVisible(false);
diff --git a/src/utility.cpp b/src/utility.cpp
index d324b4c4..807b299e 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -881,16 +881,8 @@ bool windowPosValid(QPoint pos)
 }
 
 QMetaObject::Connection PulseWidget(QWidget *widget, QColor startColor,
-				    QColor endColor, QString specifier,
-				    bool once)
+				    QColor endColor, bool once)
 {
-	widget->setStyleSheet(specifier + "{ \
-		border-style: outset; \
-		border-width: 2px; \
-		border-radius: 10px; \
-		border-color: rgb(0,0,0,0) \
-		}");
-
 	QGraphicsColorizeEffect *eEffect = new QGraphicsColorizeEffect(widget);
 	widget->setGraphicsEffect(eEffect);
 	QPropertyAnimation *paAnimation =