UI: Fix alignment of volume sliders

With the Yami themes, the volume sliders wouldn't be aligned in the center of the layout.
obsproject · Oct 1, 2022 · 193d48f · 193d48f
1 parent ff0f5ca
commit 193d48f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
@@ -974,10 +974,6 @@ QHeaderView::section {
 
 /* Mute CheckBox */
 
-MuteCheckBox {
-    margin: 4px 0px 0px;
-}
-
 MuteCheckBox::indicator:checked {
     image: url(./Dark/mute.svg);
 }

diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
@@ -962,10 +962,6 @@ QHeaderView::section {
 
 /* Mute CheckBox */
 
-MuteCheckBox {
-    margin: 4px 0px 0px;
-}
-
 MuteCheckBox::indicator:checked {
     image: url(./Dark/mute.svg);
 }

diff --git a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
@@ -962,10 +962,6 @@ QHeaderView::section {
 
 /* Mute CheckBox */
 
-MuteCheckBox {
-    margin: 4px 0px 0px;
-}
-
 MuteCheckBox::indicator:checked {
     image: url(./Light/mute.svg);
 }

diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
@@ -966,10 +966,6 @@ QHeaderView::section {
 
 /* Mute CheckBox */
 
-MuteCheckBox {
-    margin: 4px 0px 0px;
-}
-
 MuteCheckBox::indicator:checked {
     image: url(./Dark/mute.svg);
 }

diff --git a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
@@ -966,10 +966,6 @@ QHeaderView::section {
 
 /* Mute CheckBox */
 
-MuteCheckBox {
-    margin: 4px 0px 0px;
-}
-
 MuteCheckBox::indicator:checked {
     image: url(./Dark/mute.svg);
 }

diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp
@@ -248,7 +248,6 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
 
 		setMaximumWidth(110);
 	} else {
-		QHBoxLayout *volLayout = new QHBoxLayout;
 		QHBoxLayout *textLayout = new QHBoxLayout;
 		QHBoxLayout *botLayout = new QHBoxLayout;
 
@@ -261,16 +260,17 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
 		textLayout->setAlignment(nameLabel, Qt::AlignLeft);
 		textLayout->setAlignment(volLabel, Qt::AlignRight);
 
-		volLayout->addWidget(slider);
-		volLayout->addWidget(mute);
-		volLayout->setSpacing(5);
-
 		botLayout->setContentsMargins(0, 0, 0, 0);
-		botLayout->setSpacing(0);
-		botLayout->addLayout(volLayout);
+		botLayout->setSpacing(5);
+		botLayout->addWidget(slider);
+		botLayout->addWidget(mute);
+		botLayout->setAlignment(slider, Qt::AlignVCenter);
+		botLayout->setAlignment(mute, Qt::AlignVCenter);
 
-		if (showConfig)
+		if (showConfig) {
 			botLayout->addWidget(config);
+			botLayout->setAlignment(config, Qt::AlignVCenter);
+		}
 
 		mainLayout->addItem(textLayout);
 		mainLayout->addWidget(volMeter);