From a0e7c951482f8d0647c83f43a0713901414cf399 Mon Sep 17 00:00:00 2001
From: Pierre Baillargeon <Pierre.Baillargeon@Autodesk.com>
Date: Thu, 16 Jan 2025 10:59:28 -0500
Subject: [PATCH] EMSUSD-1997 adjust colelction UI spacing

Adjust the spacing in the include/exclude header buttons.
---
 .../collection/includeExcludeWidget.py        | 20 ++++++++++++++++---
 .../usdSharedComponents/common/menuButton.py  |  1 +
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py b/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py
index 8f31743cf..cc91b6232 100644
--- a/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py
+++ b/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py
@@ -45,18 +45,29 @@ def __init__(
         self._expressionMenu = ExpressionMenu(data, self)
         menuButton = MenuButton(self._expressionMenu, self)
 
+        spacer = QWidget()
+        spacer.setMinimumWidth(0)
+        spacer.setSizePolicy(
+            QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed
+        )
+
         self._filterWidget = QLineEdit()
         self._filterWidget.setSizePolicy(
             QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed
         )
+        self._filterWidget.setMaximumWidth(Theme.instance().uiScaled(165))
         self._filterWidget.setPlaceholderText(SEARCH_PLACEHOLDER_LABEL)
         self._filterWidget.setClearButtonEnabled(True)
 
         separator = QFrame()
         separator.setFrameShape(QFrame.VLine)
+        separator.setMaximumHeight(Theme.instance().uiScaled(20))
 
         headerWidget = QWidget(self)
         headerLayout = QHBoxLayout(headerWidget)
+        topMargin = Theme.instance().uiScaled(4)
+        margin = Theme.instance().uiScaled(2)
+        headerLayout.setContentsMargins(margin, topMargin, margin, margin)
 
         if Host.instance().canPick:
             addBtn = QToolButton(headerWidget)
@@ -73,6 +84,9 @@ def __init__(
         self._deleteBtn.setToolTip(REMOVE_OBJECTS_TOOLTIP)
         self._deleteBtn.setIcon(Theme.instance().icon("delete"))
         self._deleteBtn.setPopupMode(QToolButton.InstantPopup)
+        self._deleteBtn.setEnabled(False)
+        self.setStyleSheet("""QToolButton { border: 0px; }""")
+
         self._deleteBtnMenu = QMenu(self._deleteBtn)
         self._deleteBtnMenu.addAction(
             REMOVE_FROM_INCLUDES_LABEL, self.onRemoveSelectionFromInclude
@@ -81,13 +95,13 @@ def __init__(
             REMOVE_FROM_EXCLUDES_LABEL, self.onRemoveSelectionFromExclude
         )
         self._deleteBtn.setMenu(self._deleteBtnMenu)
-        headerLayout.addWidget(self._deleteBtn)
-
-        self._deleteBtn.setEnabled(False)
 
+        headerLayout.addWidget(self._deleteBtn)
+        headerLayout.addWidget(spacer)
         headerLayout.addWidget(self._filterWidget)
         headerLayout.addWidget(separator)
         headerLayout.addWidget(menuButton)
+
         mainLayout.addWidget(headerWidget)
 
         self._include = StringListPanel(data.getIncludeData(), True, INCLUDE_LABEL, self)
diff --git a/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/common/menuButton.py b/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/common/menuButton.py
index 5fd0f5cbd..d405dbd91 100644
--- a/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/common/menuButton.py
+++ b/lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/common/menuButton.py
@@ -11,6 +11,7 @@ def __init__(self, menu: QMenu, parent: QWidget = None):
         super(MenuButton, self).__init__(parent)
         self.setIcon(Theme.instance().icon("menu"))
         self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.setMaximumWidth(Theme.instance().uiScaled(16))
         self.setArrowType(Qt.NoArrow)
         self.setPopupMode(QToolButton.InstantPopup)
         self.setStyleSheet("""