From c3b078754407dad9a379ee72903225793725d087 Mon Sep 17 00:00:00 2001
From: cg2121 <claytong1214@gmail.com>
Date: Mon, 29 Aug 2022 19:48:12 -0500
Subject: [PATCH] UI: Make list widget styles consistent

The script and scene switcher lists were not being styled.

This also sets the spacing to 1 for the filter, script, scene
switcher and properties view lists, the same as other lists.
---
 UI/data/themes/Acri.qss                                    | 7 +++++++
 UI/data/themes/Grey.qss                                    | 7 +++++++
 UI/data/themes/Light.qss                                   | 7 +++++++
 UI/data/themes/Rachni.qss                                  | 7 +++++++
 UI/data/themes/Yami.qss                                    | 7 +++++++
 UI/forms/OBSBasicFilters.ui                                | 6 ++++++
 .../frontend-tools/forms/auto-scene-switcher.ui            | 3 +++
 UI/frontend-plugins/frontend-tools/forms/scripts.ui        | 3 +++
 UI/properties-view.cpp                                     | 1 +
 9 files changed, 48 insertions(+)

diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index f7195f323..5555358c6 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -179,22 +179,29 @@ QMenuBar::item:selected {
 }
 
 /* Item Lists */
+QListWidget {
+    border-radius: 4px;
+}
+
 QListWidget::item {
     color: palette(text);
 }
 
+QListWidget,
 QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item {
     padding: 6px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item,
diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
index 2427761c7..cc7ffb0cb 100644
--- a/UI/data/themes/Grey.qss
+++ b/UI/data/themes/Grey.qss
@@ -179,22 +179,29 @@ QMenuBar::item:selected {
 }
 
 /* Item Lists */
+QListWidget {
+    border-radius: 4px;
+}
+
 QListWidget::item {
     color: palette(text);
 }
 
+QListWidget,
 QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item {
     padding: 6px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item,
diff --git a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
index c52f79060..b4e747899 100644
--- a/UI/data/themes/Light.qss
+++ b/UI/data/themes/Light.qss
@@ -179,22 +179,29 @@ QMenuBar::item:selected {
 }
 
 /* Item Lists */
+QListWidget {
+    border-radius: 4px;
+}
+
 QListWidget::item {
     color: palette(text);
 }
 
+QListWidget,
 QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item {
     padding: 6px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item,
diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
index 1b69fba70..89bc912cc 100644
--- a/UI/data/themes/Rachni.qss
+++ b/UI/data/themes/Rachni.qss
@@ -181,22 +181,29 @@ QMenuBar::item:selected {
 }
 
 /* Item Lists */
+QListWidget {
+    border-radius: 4px;
+}
+
 QListWidget::item {
     color: palette(text);
 }
 
+QListWidget,
 QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item {
     padding: 6px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item,
diff --git a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
index 1330227a7..70c975ed9 100644
--- a/UI/data/themes/Yami.qss
+++ b/UI/data/themes/Yami.qss
@@ -179,22 +179,29 @@ QMenuBar::item:selected {
 }
 
 /* Item Lists */
+QListWidget {
+    border-radius: 4px;
+}
+
 QListWidget::item {
     color: palette(text);
 }
 
+QListWidget,
 QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item {
     padding: 6px;
 }
 
+QListWidget::item,
 SourceTreeItem,
 QMenu::item,
 SceneTree::item,
diff --git a/UI/forms/OBSBasicFilters.ui b/UI/forms/OBSBasicFilters.ui
index b6fc7c568..8f3c157f6 100644
--- a/UI/forms/OBSBasicFilters.ui
+++ b/UI/forms/OBSBasicFilters.ui
@@ -69,6 +69,9 @@
             <property name="contextMenuPolicy">
              <enum>Qt::CustomContextMenu</enum>
             </property>
+            <property name="spacing">
+             <number>1</number>
+            </property>
            </widget>
           </item>
           <item>
@@ -279,6 +282,9 @@
             <property name="contextMenuPolicy">
              <enum>Qt::CustomContextMenu</enum>
             </property>
+            <property name="spacing">
+             <number>1</number>
+            </property>
            </widget>
           </item>
           <item>
diff --git a/UI/frontend-plugins/frontend-tools/forms/auto-scene-switcher.ui b/UI/frontend-plugins/frontend-tools/forms/auto-scene-switcher.ui
index c2d952ac1..3ede35067 100644
--- a/UI/frontend-plugins/frontend-tools/forms/auto-scene-switcher.ui
+++ b/UI/frontend-plugins/frontend-tools/forms/auto-scene-switcher.ui
@@ -52,6 +52,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="spacing">
+      <number>1</number>
+     </property>
      <property name="sortingEnabled">
       <bool>true</bool>
      </property>
diff --git a/UI/frontend-plugins/frontend-tools/forms/scripts.ui b/UI/frontend-plugins/frontend-tools/forms/scripts.ui
index 674a54e57..ce8987c50 100644
--- a/UI/frontend-plugins/frontend-tools/forms/scripts.ui
+++ b/UI/frontend-plugins/frontend-tools/forms/scripts.ui
@@ -47,6 +47,9 @@
            <property name="contextMenuPolicy">
             <enum>Qt::CustomContextMenu</enum>
            </property>
+           <property name="spacing">
+            <number>1</number>
+           </property>
            <property name="sortingEnabled">
             <bool>true</bool>
            </property>
diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp
index 11e7d99b1..b4801c89b 100644
--- a/UI/properties-view.cpp
+++ b/UI/properties-view.cpp
@@ -658,6 +658,7 @@ void OBSPropertiesView::AddEditableList(obs_property_t *prop,
 	list->setSortingEnabled(false);
 	list->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	list->setToolTip(QT_UTF8(obs_property_long_description(prop)));
+	list->setSpacing(1);
 
 	for (size_t i = 0; i < count; i++) {
 		OBSDataAutoRelease item = obs_data_array_item(array, i);