frontend: Adjust styling for SourceTree

obsproject · Feb 7, 2025 · b6c7795 · b6c7795
1 parent 79f5ba0
commit b6c7795
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 51 deletions.
diff --git a/frontend/components/SourceTreeDelegate.cpp b/frontend/components/SourceTreeDelegate.cpp
@@ -10,7 +10,7 @@ QSize SourceTreeDelegate::sizeHint(const QStyleOptionViewItem &option, const QMo
 	QWidget *item = tree->indexWidget(index);
 
 	if (!item)
-		return (QSize(0, 0));
+		return QStyledItemDelegate::sizeHint(option, index);
 
-	return (QSize(option.widget->minimumWidth(), item->height()));
+	return (QSize(item->sizeHint()));
 }
diff --git a/frontend/data/themes/Yami.obt b/frontend/data/themes/Yami.obt
@@ -435,8 +435,7 @@ QDoubleSpinBox {
 }
 
 QListWidget QWidget,
-SceneTree QWidget,
-SourceTree QWidget {
+QListView QWidget {
     margin-top: 0;
     margin-bottom: 0;
 }
@@ -503,15 +502,13 @@ QListWidget::item {
 }
 
 QListWidget,
-QMenu,
-SceneTree,
-SourceTree {
+QListView,
+QMenu {
     padding: var(--spacing_base);
 }
 
 QListWidget::item,
-SourceTreeItem,
-SceneTree::item {
+SourceTreeItem {
     padding: var(--padding_large) var(--padding_large);
 }
 
@@ -524,62 +521,53 @@ QMenu::item {
 }
 
 QListWidget::item,
-SourceTreeItem,
-QMenu::item,
-SceneTree::item {
+QListView::item,
+QMenu::item {
     border-radius: var(--border_radius);
     color: var(--text);
     border: 1px solid transparent;
 }
 
-SourceTree::item {
+SourceTreeItem {
     border-radius: var(--border_radius);
     color: var(--text);
 }
 
 QMenu::item:selected,
 QListWidget::item:selected,
-SceneTree::item:selected,
-SourceTree::item:selected {
+QListView::item:selected {
     background-color: var(--primary);
 }
 
 QMenu::item:hover,
 QListWidget::item:hover,
-SceneTree::item:hover,
-SourceTree::item:hover,
+QListView::item:hover,
 QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
-SceneTree::item:selected:hover,
-SourceTree::item:selected:hover {
+QListView::item:selected:hover {
     background-color: var(--primary_light);
     color: var(--text);
 }
 
 QMenu::item:focus,
 QListWidget::item:focus,
-SceneTree::item:focus,
-SourceTree::item:focus,
+QListView::item:focus,
 QMenu::item:selected:focus,
 QListWidget::item:selected:focus,
-SceneTree::item:selected:focus,
-SourceTree::item:selected:focus {
+QListView::item:selected:focus {
     border: 1px solid var(--border_highlight);
 }
 
 QListWidget::item:disabled,
 QListWidget::item:disabled:hover,
-SourceTree::item:disabled,
-SourceTree::item:disabled:hover,
-SceneTree::item:disabled,
-SceneTree::item:disabled:hover {
+QListView::item:disabled,
+QListView::item:disabled:hover {
     background: transparent;
     color: var(--text_disabled);
 }
 
 QListWidget QLineEdit,
-SceneTree QLineEdit,
-SourceTree QLineEdit {
+QListView QLineEdit {
     padding: 0;
     padding-bottom: 1px;
     margin: 0;
@@ -588,23 +576,12 @@ SourceTree QLineEdit {
 }
 
 QListWidget QLineEdit:focus,
-SceneTree QLineEdit:focus,
-SourceTree QLineEdit:focus {
+QListView QLineEdit:focus {
     border: 1px solid var(--grey1);
 }
 
 /* Settings QList */
 
-OBSBasicSettings QListWidget {
-    border-radius: var(--border_radius);
-    padding: var(--spacing_base);
-}
-
-OBSBasicSettings QListWidget::item {
-    border-radius: var(--border_radius);
-    padding: var(--padding_large);
-}
-
 OBSBasicSettings QScrollBar:vertical {
     width: var(--settings_scrollbar_size);
     margin-left: 9px;
@@ -1486,16 +1463,6 @@ OBSQTDisplay {
 
 /* Filters Window */
 
-OBSBasicFilters QListWidget {
-    border-radius: var(--border_radius_large);
-    padding: var(--spacing_base);
-}
-
-OBSBasicFilters QListWidget::item {
-    border-radius: var(--border_radius);
-    padding: var(--padding_base) var(--padding_large);
-}
-
 OBSBasicFilters #widget,
 OBSBasicFilters #widget_2 {
     margin: 0px;