Merge pull request #4052 from Autodesk/barbalt/dev/EMSUSD-1902

EMSUSD-1902 EMSUSD-1918 Fix minimum size and mouse scroll issue

Author: seando-adsk

lib/mayaUsd/resources/ae/CMakeLists.txt

@@ -72,18 +72,14 @@ if(MAYA_APP_VERSION VERSION_GREATER_EQUAL 2023)
     )
 
     set(LIB_ICONS
-        ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/menu
+        ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/add
         ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/delete
+        ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/menu
+        ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/selector
+        ${MAYAUSD_SHARED_COMPONENTS}/icons/dark/warning
     )
     foreach(ICON_BASE ${LIB_ICONS})
-        # The _100.png files need to be installed without the _100. This is the
-        # base icon name that is used. Maya will automatically choose the _150/_200
-        # image if neeeded.
-        install(FILES "${ICON_BASE}_100.png"
-            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/python/usd_shared_components/icons/dark"
-            RENAME "${ICON_BASE}.png"
-        )
-        install(FILES "${ICON_BASE}_150.png" "${ICON_BASE}_200.png"
+        install(FILES "${ICON_BASE}.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/python/usd_shared_components/icons/dark"
         )
     endforeach()

lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/expressionWidget.py

@@ -1,5 +1,6 @@
 from .expressionRulesMenu import ExpressionMenu
 from ..common.menuButton import MenuButton
+from ..common.theme import Theme
 
 try:
     from PySide6.QtCore import QEvent, Qt  # type: ignore
@@ -16,27 +17,34 @@ def __init__(self, collection: Usd.CollectionAPI, parent: QWidget, expressionCha
         self._collection = collection
         self._expressionCallback = expressionChangedCallback
 
-        self._expressionText = QTextEdit(self)
-        self._expressionText.setContentsMargins(0,0,0,0)
-        self._expressionText.setLineWrapMode(QTextEdit.LineWrapMode.WidgetWidth)
-        self._expressionText.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        self._expressionText.setPlaceholderText("Type an expression here...")
+        mainLayout = QVBoxLayout(self)
+        margin: int = Theme.instance().uiScaled(2)
+        mainLayout.setSpacing(margin)
 
         self._expressionMenu = ExpressionMenu(collection, self)
         menuButton = MenuButton(self._expressionMenu, self)
 
         menuWidget = QWidget(self)
         menuLayout = QHBoxLayout(menuWidget)
+
+        margins = menuLayout.contentsMargins()
+        margins.setRight(0)
+        menuLayout.setContentsMargins(margins)
+
         menuLayout.addStretch(1)
         menuLayout.addWidget(menuButton)
+        menuWidget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+
+        self._expressionText = QTextEdit(self)
+        self._expressionText.setLineWrapMode(QTextEdit.LineWrapMode.WidgetWidth)
+        self._expressionText.setMinimumHeight(Theme.instance().uiScaled(80))
+        self._expressionText.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored)
+        self._expressionText.setPlaceholderText("Type an expression here...")
+
+        mainLayout.addWidget(menuWidget, 0)
+        mainLayout.addWidget(self._expressionText, 1)
 
-        mainLayout = QVBoxLayout(self)
-        mainLayout.setContentsMargins(0,0,0,0)
-        mainLayout.addWidget(menuWidget)
-        mainLayout.addWidget(self._expressionText)
-        
         self._expressionText.installEventFilter(self)
-        self.setLayout(mainLayout)
         self.update()
 
     def update(self):
@@ -71,4 +79,4 @@ def eventFilter(self, obj, event):
         elif event.type() == QEvent.FocusOut:
             self.submitExpression()
 
-        return super().eventFilter(obj, event)
+        return super().eventFilter(obj, event)

lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py

@@ -10,18 +10,15 @@
 try:
     from PySide6.QtCore import QEvent, QObject, Qt  # type: ignore
     from PySide6.QtWidgets import QFrame, QHBoxLayout, QVBoxLayout, QLineEdit, QMenu, QSizePolicy, QToolButton, QWidget  # type: ignore
-    from PySide6.QtGui import QAction # type: ignore
 except ImportError:
     from PySide2.QtCore import QEvent, QObject, Qt  # type: ignore
     from PySide2.QtWidgets import QFrame, QHBoxLayout, QVBoxLayout, QLineEdit, QMenu, QSizePolicy, QToolButton, QWidget  # type: ignore
-    from PySide2.QtGui import QAction # type: ignore
 
 from pxr import Usd, Sdf
 
 # TODO: support I8N
 kSearchPlaceHolder = "Search..."
 
-
 class IncludeExcludeWidget(QWidget):
     def __init__(
         self,
@@ -34,15 +31,13 @@ def __init__(
         self._prim: Usd.Prim = prim
         self._updatingUI = False
 
-        includeExcludeLayout = QVBoxLayout(self)
-
-        includeExcludeLayout.setContentsMargins(0, 0, 0, 0)
+        mainLayout = QVBoxLayout(self)
+        mainLayout.setContentsMargins(0, 0, 0, 0)
 
         self._expressionMenu = ExpressionMenu(self._collection, self)
         menuButton = MenuButton(self._expressionMenu, self)
 
         self._filterWidget = QLineEdit()
-        self._filterWidget.setContentsMargins(0, 0, 0, 0)
         self._filterWidget.setSizePolicy(
             QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed
         )
@@ -53,33 +48,30 @@ def __init__(
         separator.setFrameShape(QFrame.VLine)
 
         headerWidget = QWidget(self)
-        headerWidget.setContentsMargins(0, 0, 0, 0)
         headerLayout = QHBoxLayout(headerWidget)
 
-        headerLayout.setContentsMargins(0, 2, 2, 0)
-
         if Host.instance().canPick:
             addBtn = QToolButton(headerWidget)
-            addBtn.setToolTip("Add prims to Include or Exclude")
+            addBtn.setToolTip("Add Objects to the Include/Exclude list")
             addBtn.setIcon(Theme.instance().icon("add"))
             addBtn.setPopupMode(QToolButton.InstantPopup)
             addBtnMenu = QMenu(addBtn)
-            addBtnMenu.addAction("Add prims to Include", self.onAddToIncludePrimClicked)
-            addBtnMenu.addAction("Add prims to Exclude", self.onAddToExcludePrimClicked)
+            addBtnMenu.addAction("Include Objects...", self.onAddToIncludePrimClicked)
+            addBtnMenu.addAction("Exclude Objects...", self.onAddToExcludePrimClicked)
             addBtn.setMenu(addBtnMenu)
             headerLayout.addWidget(addBtn)
 
         self._deleteBtn = QToolButton(headerWidget)
-        self._deleteBtn.setToolTip("Remove selected prims from Include or Exclude")
+        self._deleteBtn.setToolTip("Remove Selected Objects from Include/Exclude list")
         self._deleteBtn.setIcon(Theme.instance().icon("delete"))
         self._deleteBtn.setPopupMode(QToolButton.InstantPopup)
         self._deleteBtnMenu = QMenu(self._deleteBtn)
-        self._deleteBtnActionFromIncludes = QAction("Remove selected prims from Include", self._deleteBtnMenu)
-        self._deleteBtnActionFromIncludes.triggered.connect(self.onRemoveSelectionFromInclude)
-        self._deleteBtnMenu.addAction(self._deleteBtnActionFromIncludes)
-        self._deleteBtnActionFromExcludes = QAction("Remove selected prims from Exclude", self._deleteBtnMenu)
-        self._deleteBtnActionFromExcludes.triggered.connect(self.onRemoveSelectionFromExclude)
-        self._deleteBtnMenu.addAction(self._deleteBtnActionFromExcludes)
+        self._deleteBtnActionFromIncludes = self._deleteBtnMenu.addAction(
+            "Remove Selected Objects from Include", self.onRemoveSelectionFromInclude
+        )
+        self._deleteBtnActionFromExcludes = self._deleteBtnMenu.addAction(
+            "Remove Selected Objects from Exclude", self.onRemoveSelectionFromExclude
+        )
         self._deleteBtn.setMenu(self._deleteBtnMenu)
         headerLayout.addWidget(self._deleteBtn)
 
@@ -88,7 +80,7 @@ def __init__(
         headerLayout.addWidget(self._filterWidget)
         headerLayout.addWidget(separator)
         headerLayout.addWidget(menuButton)
-        includeExcludeLayout.addWidget(headerWidget)
+        mainLayout.addWidget(headerWidget)
 
         self._include = StringList([], "Include", "Include all", self)
         self._include.cbIncludeAll.stateChanged.connect(self.onIncludeAllToggle)
@@ -97,29 +89,32 @@ def __init__(
             "USD_Light_Linking",
             "IncludeListHeight",
             self,
-            defaultSize=80,
+            defaultSize=Theme.instance().uiScaled(80),
         )
-        includeExcludeLayout.addWidget(self._resizableInclude)
+        self._resizableInclude.minContentSize = Theme.instance().uiScaled(44)
+        mainLayout.addWidget(self._resizableInclude)
 
         self._exclude = StringList([], "Exclude", "", self)
         self._resizableExclude = Resizable(
             self._exclude,
             "USD_Light_Linking",
             "ExcludeListHeight",
             self,
-            defaultSize=80,
+            defaultSize=Theme.instance().uiScaled(80),
         )
-        includeExcludeLayout.addWidget(self._resizableExclude)
+        self._resizableExclude.minContentSize = Theme.instance().uiScaled(44)
+        mainLayout.addWidget(self._resizableExclude)
 
         self._include.list.selectionChanged.connect(self.onListSelectionChanged)
         self._exclude.list.selectionChanged.connect(self.onListSelectionChanged)
 
         self._filterWidget.textChanged.connect(self._include.list._model.setFilter)
         self._filterWidget.textChanged.connect(self._exclude.list._model.setFilter)
-        EventFilter(self._include.list, self)
-        EventFilter(self._exclude.list, self)
 
-        self.setLayout(includeExcludeLayout)
+        if Host.instance().canDrop:
+            EventFilter(self._include.list, self)
+            EventFilter(self._exclude.list, self)
+
         self.updateUI()
         self.onListSelectionChanged()
 
@@ -140,8 +135,8 @@ def update(self):
 
         self._include.list.items = includes
         self._exclude.list.items = excludes
-        self._include.list.update_placeholder()
-        self._exclude.list.update_placeholder()
+        self._include.list.updatePlaceholder()
+        self._exclude.list.updatePlaceholder()
 
     def getIncludedItems(self):
         return self._include.list.items()
@@ -156,6 +151,7 @@ def setIncludeAll(self, value: bool):
         self._include.cbIncludeAll.setChecked(value)
 
     def updateUI(self):
+
         if self._updatingUI:
             return
 
@@ -180,22 +176,22 @@ def updateUI(self):
         self._updatingUI = False
 
     def onAddToIncludePrimClicked(self):
-        prims: Sequence[Usd.Prim] = Host.instance().pick(self._prim.GetStage())
-        if prims is None:
+        pickedItems: Sequence[Usd.Prim] = Host.instance().pick(self._prim.GetStage(), dialogTitle="Add Include Objects")
+        if pickedItems is None:
             return
         self._updatingUI = True
-        for prim in prims:
-            self._collection.GetIncludesRel().AddTarget(prim.GetPath())
+        for item in pickedItems:
+            self._collection.GetIncludesRel().AddTarget(item.GetPath())
         self._updatingUI = False
         self.updateUI()
 
     def onAddToExcludePrimClicked(self):
-        prims: Sequence[Usd.Prim] = Host.instance().pick(self._prim.GetStage())
-        if prims is None:
+        pickedItems: Sequence[Usd.Prim] = Host.instance().pick(self._prim.GetStage(), dialogTitle="Add Exclude Objects")
+        if pickedItems is None:
             return
         self._updatingUI = True
-        for prim in prims:
-            self._collection.GetExcludesRel().AddTarget(prim.GetPath())
+        for item in pickedItems:
+            self._collection.GetExcludesRel().AddTarget(item.GetPath())
         self._updatingUI = False
         self.updateUI()
 
@@ -206,7 +202,6 @@ def onRemoveSelectionFromInclude(self):
         self._updatingUI = False
         self.updateUI()
         self.onListSelectionChanged()
-        self._include.list.update_placeholder()
 
     def onRemoveSelectionFromExclude(self):
         self._updatingUI = True
@@ -215,7 +210,6 @@ def onRemoveSelectionFromExclude(self):
         self._updatingUI = False
         self.updateUI()
         self.onListSelectionChanged()
-        self._exclude.list.update_placeholder()
 
     def onListSelectionChanged(self):
         includesSelected = self._include.list.hasSelectedItems
@@ -233,16 +227,16 @@ def onListSelectionChanged(self):
 
         if includesSelected and excludeSelected:
             self._deleteBtn.setToolTip(
-                "Remove selected prims from Include or Exclude..."
+                "Remove Selected Objects from Include/Exclude list"
             )
             self._deleteBtn.setPopupMode(QToolButton.InstantPopup)
             self._deleteBtn.setStyleSheet("")
         else:
             if includesSelected:
-                self._deleteBtn.setToolTip("Remove selected prims from Include")
+                self._deleteBtn.setToolTip("Remove Selected Objects from Include")
                 self._deleteBtn.pressed.connect(self.onRemoveSelectionFromInclude)
             elif excludeSelected:
-                self._deleteBtn.setToolTip("Remove selected prims from Exclude")
+                self._deleteBtn.setToolTip("Remove Selected Objects from Exclude")
                 self._deleteBtn.pressed.connect(self.onRemoveSelectionFromExclude)
             self._deleteBtn.setPopupMode(QToolButton.DelayedPopup)
             self._deleteBtn.setStyleSheet(

lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/widget.py

@@ -1,18 +1,30 @@
 from .includeExcludeWidget import IncludeExcludeWidget
 from .expressionWidget import ExpressionWidget
+from ..common.theme import Theme
 
 try:
-    from PySide6.QtCore import Slot  # type: ignore
-    from PySide6.QtGui import QIcon  # type: ignore
-    from PySide6.QtWidgets import QWidget, QTabWidget, QVBoxLayout  # type: ignore
+    from PySide6.QtCore import QEvent, QObject, Qt, Slot  # type: ignore
+    from PySide6.QtGui import QIcon, QWheelEvent  # type: ignore
+    from PySide6.QtWidgets import QTabBar, QTabWidget, QVBoxLayout, QWidget  # type: ignore
 except ImportError:
-    from PySide2.QtCore import Slot  # type: ignore
-    from PySide2.QtGui import QIcon  # type: ignore
-    from PySide2.QtWidgets import QWidget, QTabWidget, QVBoxLayout  # type: ignore
+    from PySide2.QtCore import QEvent, QObject, Qt, Slot  # type: ignore
+    from PySide2.QtGui import QIcon, QWheelEvent  # type: ignore
+    from PySide2.QtWidgets import QTabBar, QTabWidget, QVBoxLayout, QWidget  # type: ignore
 
 from pxr import Usd, Tf
 
 
+class NonScrollingTabBar(QTabBar):
+    """A QTabBar that does not switch tabs when the mouse wheel is used."""
+
+    def __init__(self, parent: QWidget = None):
+        super(NonScrollingTabBar, self).__init__(parent)
+
+    def wheelEvent(self, event: QWheelEvent):
+        # Ignore the event. This cannot be done using an event filter as the
+        # event needs to be properly ignored to 'bubble up' the parent chain.
+        event.ignore()
+
 class CollectionWidget(QWidget):
 
     def __init__(
@@ -39,18 +51,30 @@ def __init__(
             Usd.Notice.ObjectsChanged, self.onObjectsChanged, self._prim.GetStage()
         )
 
+        self._tabWidget = None
+
         # only create tab when usd version is greater then 23.11
         if Usd.GetVersion() >= (0, 23, 11):
-            tabWidget = QTabWidget()
-            tabWidget.currentChanged.connect(self.onTabChanged)
+            self._tabWidget = QTabWidget()
+            self._tabWidget.setTabBar(NonScrollingTabBar(self._tabWidget))
+            self._tabWidget.currentChanged.connect(self.onTabChanged)
+            self._tabWidget.setDocumentMode(True)
 
             self._expressionWidget = ExpressionWidget(
-                collection, tabWidget, self.onExpressionChanged
+                collection, self._tabWidget, self.onExpressionChanged
+            )
+            self._tabWidget.addTab(
+                self._includeExcludeWidget, QIcon(), "Include/Exclude"
             )
-            tabWidget.addTab(self._includeExcludeWidget, QIcon(), "Include/Exclude")
-            tabWidget.addTab(self._expressionWidget, QIcon(), "Expression")
+            self._tabWidget.addTab(self._expressionWidget, QIcon(), "Expression")
+
+            offset: int = Theme.instance().uiScaled(4)
+            self._includeExcludeWidget.setContentsMargins(0, offset, 0, 0)
+            self._expressionWidget.setContentsMargins(0, offset, 0, 0)
 
-            mainLayout.addWidget(tabWidget)
+            self._tabWidget.tabBar().setExpanding(True)
+            self._tabWidget.tabBar().setCursor(Qt.ArrowCursor)
+            mainLayout.addWidget(self._tabWidget)
         else:
             mainLayout.addWidget(self._includeExcludeWidget)