From a22a217848a16c24a44cdd6f9612c88afd46db41 Mon Sep 17 00:00:00 2001
From: Warchamp7 <warchamp2003@hotmail.com>
Date: Wed, 27 Nov 2024 16:25:15 -0500
Subject: [PATCH] frontend: Unify appearance of menus

---
 frontend/data/themes/Yami.obt | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/frontend/data/themes/Yami.obt b/frontend/data/themes/Yami.obt
index de668a327790fc..0b848bcdd66d18 100644
--- a/frontend/data/themes/Yami.obt
+++ b/frontend/data/themes/Yami.obt
@@ -465,12 +465,16 @@ QToolTip {
 
 /* Context Menu */
 
+QMenu::indicator {
+    left: var(--padding_large);
+}
+
 QMenu::icon {
-    left: 4px;
+    left: var(--padding_xlarge);
 }
 
 QMenu::separator {
-    background: var(--button_bg);
+    background: var(--border_color);
     height: 1px;
     margin: var(--spacing_base) var(--spacing_large);
 }
@@ -509,6 +513,10 @@ SourceTree {
     padding: var(--spacing_base);
 }
 
+QMenu {
+    border: 1px solid var(--border_color);
+}
+
 QListWidget::item,
 SourceTreeItem,
 SceneTree::item {
@@ -517,9 +525,6 @@ SceneTree::item {
 
 QMenu::item {
     padding: var(--padding_large) var(--padding_menu);
-}
-
-QMenu::item {
     padding-right: 20px;
 }
 
@@ -918,6 +923,16 @@ QDateTimeEdit {
     padding-left: 10px;
 }
 
+QComboBox QAbstractItemView {
+    padding: var(--spacing_base) var(--spacing_large);
+    border: 1px solid var(--border_color);
+    outline: none;
+}
+
+QComboBox QAbstractItemView::item {
+    padding: var(--padding_large) var(--padding_xlarge);
+}
+
 QComboBox QAbstractItemView::item:selected,
 QComboBox QAbstractItemView::item:hover {
     background-color: var(--list_item_bg_selected);
@@ -930,6 +945,11 @@ QDateTimeEdit:selected {
     border-color: var(--input_border_hover);
 }
 
+QComboBox:on {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
 QComboBox::drop-down,
 QDateTimeEdit::drop-down {
     border: none;
@@ -1726,6 +1746,10 @@ OBSHotkeyWidget QPushButton {
 
 /* Source Icons */
 
+.source-icon {
+    margin-right: var(--spacing_large);
+}
+
 OBSBasic {
     qproperty-imageIcon: url(theme:Dark/sources/image.svg);
     qproperty-colorIcon: url(theme:Dark/sources/brush.svg);