Merge branch 'dev/ptrottier/additional_ui_fixes' into 'main'

SmokedPete · SmokedPete · commit 585e5e218b1e · 2025-12-10T14:10:29.000-08:00
REMIX-4816, REMIX-4819: Implemented more UI improvements for the Logic Panels

See merge request lightspeedrtx/lightspeed-kit!1065
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - REMIX-4812: OV Property Window is no longer accessible via the Windows/Property sub menu button
 - REMIX-4715, REMIX-4826: Improved Edit Graph dialog with tree-based selection UI and disabled compound graphs
 - REMIX-4818: FilePicker now supports automatic conversion to relative paths for USD edit target compliance
+- REMIX-4816: Improved logic graph properties panel UI with icon buttons and clearer dialog messages
 
 ### Fixed
 - Improved Pyright configuration by generating a list of search paths
diff --git a/source/extensions/lightspeed.trex.app.resources/config/extension.toml b/source/extensions/lightspeed.trex.app.resources/config/extension.toml
@@ -1,5 +1,5 @@
 [package]
-version = "1.27.1"
+version = "1.27.2"
 authors = ["dbataille@nvidia.com"]
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit"
 changelog = "docs/CHANGELOG.md"
diff --git a/source/extensions/lightspeed.trex.app.resources/data/icons/LogicGraphDeleteIcon.svg b/source/extensions/lightspeed.trex.app.resources/data/icons/LogicGraphDeleteIcon.svg
@@ -1,9 +1,9 @@
 <svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="52.8076" y="9.25366" width="21.6923" height="21.6923" rx="5" stroke="#D9D9D9" stroke-width="6"/>
-<path d="M30.1924 54.7152C41.1539 54.7152 41.1539 45.4845 41.1539 37.4075C41.1539 29.3306 41.1539 20.0999 52.1155 20.0999" stroke="#D9D9D9" stroke-width="6"/>
-<rect x="6.65381" y="43.8691" width="21.6923" height="22.8462" rx="5" stroke="#D9D9D9" stroke-width="6"/>
+<rect x="52.8076" y="4.86377" width="21.6923" height="21.6923" rx="5" stroke="#D9D9D9" stroke-width="6"/>
+<path d="M30.1924 50.3253C41.1539 50.3253 41.1539 41.0946 41.1539 33.0177C41.1539 24.9407 41.1539 15.71 52.1155 15.71" stroke="#D9D9D9" stroke-width="6"/>
+<rect x="6.65381" y="39.4792" width="21.6923" height="22.8462" rx="5" stroke="#D9D9D9" stroke-width="6"/>
 <path d="M52.6924 51.8274L74.6023 73.7373" stroke="#D9D9D9" stroke-width="6"/>
 <path d="M74.6025 51.8362L52.6926 73.7461" stroke="#D9D9D9" stroke-width="6"/>
-<rect x="5.5" y="9.25366" width="21.6923" height="21.6923" rx="5" stroke="#D9D9D9" stroke-width="6"/>
-<path d="M26.7307 20.0999H53.2692" stroke="#D9D9D9" stroke-width="6"/>
+<rect x="5.5" y="4.86377" width="21.6923" height="21.6923" rx="5" stroke="#D9D9D9" stroke-width="6"/>
+<path d="M26.7307 15.71H53.2692" stroke="#D9D9D9" stroke-width="6"/>
 </svg>
diff --git a/source/extensions/lightspeed.trex.app.resources/data/icons/pencil.svg b/source/extensions/lightspeed.trex.app.resources/data/icons/pencil.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="white" d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+</svg>
diff --git a/source/extensions/lightspeed.trex.app.resources/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.app.resources/docs/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.27.2]
+### Added
+- Added pencil icon for edit actions
+
+### Changed
+- Aligned LogicGraphDeleteIcon for improved visual consistency
+
 ## [1.27.1]
 ### Fixed
 - Fixed Logic Graph Editor window title to "Logic Graph"
@@ -276,3 +283,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [1.0.0] - 2023-05-18
 ### Added
 - Created
+
diff --git a/source/extensions/lightspeed.trex.app.style/config/extension.toml b/source/extensions/lightspeed.trex.app.style/config/extension.toml
@@ -2,7 +2,7 @@
 authors =["Damien Bataille <dbataille@nvidia.com>"]
 title = "NVIDIA RTX Remix Style"
 description = "Global Style for NVIDIA RTX Remix App"
-version = "1.19.1"
+version = "1.19.2"
 readme = "docs/README.md"
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit/-/tree/main/source/extensions/lightspeed.trex.app.style"
 category = "internal"
diff --git a/source/extensions/lightspeed.trex.app.style/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.app.style/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.19.2]
+### Added
+- Added Edit icon styles for properties panel actions
+- Added PropertiesWidgetValue label style
+
 ## [1.19.1]
 ### Added
 - Added sidebar icons with hover, selected, and disabled states for Logic Graph button
@@ -193,3 +198,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [1.0.0] - 2024-02-28
 ### Added
 - Created
+
diff --git a/source/extensions/lightspeed.trex.app.style/lightspeed/trex/app/style/trex_style.py b/source/extensions/lightspeed.trex.app.style/lightspeed/trex/app/style/trex_style.py
@@ -568,6 +568,9 @@ def override_dialog_get_style(style_value):  # noqa PLW0621
         "Image::LogicGraphStatic:selected": {"image_url": _get_icons("LogicGraphIconThin"), "color": _WHITE_100},
         "Image::LogicGraphStaticDisabled": {"image_url": _get_icons("LogicGraphIconThin"), "color": _WHITE_30},
         "Image::LogicGraphNodeStatic": {"image_url": _get_icons("LogicGraphNodeIconThin"), "color": _WHITE_80},
+        "Image::Edit": {"image_url": _get_icons("pencil"), "color": _WHITE_60},
+        "Image::Edit:hovered": {"image_url": _get_icons("pencil"), "color": _WHITE_80},
+        "Image::Edit:disabled": {"image_url": _get_icons("pencil"), "color": _WHITE_30},
         "Image::Update": {"image_url": _get_icons("update"), "color": _WHITE_60},
         "Image::Update:hovered": {"image_url": _get_icons("update"), "color": _WHITE_80},
         "Image::Update:disabled": {"image_url": _get_icons("update"), "color": _WHITE_30},
@@ -739,6 +742,7 @@ def override_dialog_get_style(style_value):  # noqa PLW0621
         },
         "Label::ProgressLabel": {"color": _WHITE_100},
         "Label::PropertiesWidgetLabel": {"color": _WHITE_70, "font_size": 18, "font": ui.url.nvidia_md},
+        "Label::PropertiesWidgetValue": {"color": _WHITE_60, "font_size": 18, "font": ui.url.nvidia_rg},
         "Label::ExperimentalFeatureLabel": {"color": _WHITE_50, "font_size": 18, "font": ui.url.nvidia_md},
         "Label::USDPropertiesWidgetValueOverlay": {"color": _WHITE_20},
         "Button::HomeButton": {"background_color": _GREY_32},
@@ -968,7 +972,7 @@ def override_dialog_get_style(style_value):  # noqa PLW0621
         "OverrideIndicatorForceDisabled": {"background_color": _GREY_70, "border_width": 0},
         "OverrideIndicator": {"background_color": _BLUE_ACTION, "border_width": 0},
         "OverrideIndicator:hovered": {"background_color": 0xFFFFDE88},
-        "OverrideBackground": {"background_color": _DARK_40},
+        "OverrideBackground": {"background_color": _GREY_42},
         "OverrideBackgroundHovered": {"background_color": _BLUE_HOVERED},
         "OverrideBackgroundSelected": {"background_color": _BLUE_SELECTED},
         "Rectangle::BackgroundButton": {"background_color": 0x33000000, "border_radius": 8},
diff --git a/source/extensions/lightspeed.trex.logic.widget/config/extension.toml b/source/extensions/lightspeed.trex.logic.widget/config/extension.toml
@@ -1,7 +1,7 @@
 [package]
 title = "Remix Logic Graph Editor"
 description = "Component editor window for Remix Component Graphs"
-version = "1.5.0"
+version = "1.5.1"
 authors = ["Chris Grebeldinger <cgrebeldinge@nvidia.com>", "Dean Edmonds <dedmonds@nvidia.com>", "Nicolas Kendall-Bar <nkendallbar@nvidia.com>"]
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit/-/tree/main/source/extensions/lightspeed.trex.logic.widget"
 keywords = ["graph", "logic", "component", "remix", "ui"]
diff --git a/source/extensions/lightspeed.trex.logic.widget/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.logic.widget/docs/CHANGELOG.md
@@ -4,6 +4,11 @@ This document records all notable changes to the **lightspeed.trex.logic.widget*
 
 The format is based on [Keep a Changelog](https://keepachangelog.com). The project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.5.1]
+### Changed
+- Improved error dialog texts and messaging for prim selection errors
+- Improved graph creation dialog wording and button label
+
 ## [1.5.0]
 ### Added
 - Added tree-based graph selection UI with improved UX for Edit Graph dialog
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_widget.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_widget.py
@@ -72,20 +72,18 @@ def create_graph(self, evaluator_type: str, name_prefix: str, menu_arg=None, val
         # Create the graph at the selected prim
         selected_prim_paths = self._selection.get_selected_prim_paths()
         if len(selected_prim_paths) != 1:
-            error_message = f"Please select exactly 1 prim, got {len(selected_prim_paths)}"
+            error_message = f"Select exactly 1 prim.\n{len(selected_prim_paths)} are currently selected."
             if use_dialog:
-                ErrorPopup("Select a single Prim", error_message).show()
+                ErrorPopup("Select Exactly 1 Prim", error_message, window_size=(400, 110)).show()
                 return
-            raise ValueError(f"Please select exactly 1 prim, got {len(selected_prim_paths)}")
+            raise ValueError(f"Select exactly 1 prim. {len(selected_prim_paths)} are currently selected.")
 
         prim = self._usd_context.get_stage().GetPrimAtPath(selected_prim_paths[0])
         graph_root_prim = LogicGraphCore.get_graph_root_prim(prim)
         if not graph_root_prim:
-            error_message = (
-                f"Please select a prim under a mesh or light asset replacement root, " f"got {selected_prim_paths[0]}"
-            )
+            error_message = "The selected prim is not a valid graph root.\nSelect a child of a mesh or light prim."
             if use_dialog:
-                ErrorPopup("Select an asset replacement root", error_message).show()
+                ErrorPopup("Invalid Selection", error_message, window_size=(400, 110)).show()
                 return
             raise ValueError(error_message)
 
@@ -123,8 +121,9 @@ def on_cancel(dialog: InputDialog):
 
             dialog = InputDialog(
                 title="Create New Logic Graph",
-                message=f'Creating new graph under:\n\t"{graph_root_path}"\n\nEnter desired graph prim name:',
+                message=f"Creating a new graph under:\n{graph_root_path}\n\nEnter the desired graph name:",
                 default_value=default_value,
+                ok_label="Create",
                 ok_handler=on_okay,
                 cancel_handler=on_cancel,
                 warning_message=warning,
diff --git a/source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml b/source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml
@@ -1,5 +1,5 @@
 [package]
-version = "1.2.4"
+version = "1.2.5"
 authors = ["Nicolas Kendall-Bar <nkendallbar@nvidia.com>"]
 title = "Remix Logic Properties Widget"
 description = "Properties panel for RemixLogic prim types"
diff --git a/source/extensions/lightspeed.trex.properties_pane.logic.widget/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.properties_pane.logic.widget/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.2.5]
+### Changed
+- Replaced text buttons with icon buttons for edit and delete actions
+- Improved existing graphs list layout with dedicated section header
+
 ## [1.2.4]
 ### Changed
 - Configured ConstAssetPath field to use relative paths
@@ -39,3 +44,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [1.0.0]
 ### Added
 - Created
+
diff --git a/source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/setup_ui.py b/source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/setup_ui.py
@@ -104,7 +104,7 @@ def _build_prim_row_with_icon(
         ui.Spacer(width=ui.Pixel(_SPACING_MD))
         with ui.VStack(width=ui.Pixel(_ICON_SIZE)):
             ui.Spacer()
-            ui.Image("", name=icon_name, width=_ICON_SIZE, height=_ICON_SIZE)
+            ui.Image("", name=icon_name, width=ui.Pixel(_ICON_SIZE), height=ui.Pixel(_ICON_SIZE))
             ui.Spacer()
         ui.Spacer(width=ui.Pixel(_SPACING_SM))
         ui.Button(
@@ -311,50 +311,64 @@ def _build_dynamic_content(self) -> None:
                     "Select a prim inside of a mesh or light asset replacement root to create a logic graph.\n\n"
                     "NOTE: The logic graph will be created on the associated root not the instance prim."
                 )
-            ui.Button(
-                "Create a New Logic Graph",
-                clicked_fn=lambda: self._create_logic_graphs(self._valid_target_paths),
-                tooltip=tooltip,
-                enabled=len(self._valid_target_paths) == 1,
-                height=ui.Pixel(_ROW_HEIGHT),
-            )
-            # Check if there are any existing logic graphs
+            with ui.VStack(spacing=ui.Pixel(8)):
+                ui.Spacer(height=0)
+                ui.Button(
+                    "Create a New Logic Graph",
+                    clicked_fn=lambda: self._create_logic_graphs(self._valid_target_paths),
+                    tooltip=tooltip,
+                    enabled=len(self._valid_target_paths) == 1,
+                    height=ui.Pixel(_ROW_HEIGHT),
+                )
+                # Check if there are any existing logic graphs
+                ui.Spacer(height=0)
             existing_graphs = LogicGraphCore.get_existing_logic_graphs(
                 self._context.get_stage(), self._valid_target_paths
             )
-            for graph in existing_graphs:
-                with ui.HStack(height=ui.Pixel(_ROW_HEIGHT), spacing=0):
+            if existing_graphs:
+                ui.Label("Existing Graphs", name="PropertiesWidgetLabel", height=0)
+                ui.Spacer(height=ui.Pixel(_SPACING_SM))
+
+            for graph in set(existing_graphs):
+                with ui.HStack(height=ui.Pixel(_ROW_HEIGHT), spacing=ui.Pixel(_SPACING_SM)):
                     relative_path = self._get_relative_path(graph.GetPath(), self._valid_target_paths)
-                    ui.Label(f"Existing Graph: {relative_path}", elided_text=True, name="PropertiesWidgetLabel")
+                    ui.Label(
+                        graph.GetPath().name, tooltip=relative_path, elided_text=True, name="PropertiesWidgetValue"
+                    )
                     ui.Spacer(width=0)
-                    ui.Button(
-                        "Edit",
-                        clicked_fn=partial(self._edit_logic_graph, graph),
-                        tooltip=f"Edit the logic graph: {graph.GetPath()}",
-                        enabled=True,
-                        width=ui.Pixel(_BUTTON_WIDTH_SM),
+                    ui.Image(
+                        "",
+                        name="Edit",
+                        width=ui.Pixel(_ICON_SIZE),
+                        height=ui.Pixel(_ICON_SIZE),
+                        tooltip="Edit the logic graph",
+                        mouse_released_fn=partial(self._edit_logic_graph, graph),
                     )
                     ui.Spacer(width=0)
-                    ui.Button(
-                        "Delete",
-                        clicked_fn=partial(self._delete_logic_graph, graph),
-                        tooltip=f"Delete the logic graph: {graph.GetPath()}",
-                        enabled=True,
-                        width=ui.Pixel(_BUTTON_WIDTH_SM),
+                    ui.Image(
+                        "",
+                        name="TrashCan",
+                        width=ui.Pixel(_ICON_SIZE),
+                        height=ui.Pixel(_ICON_SIZE),
+                        tooltip="Delete the logic graph",
+                        mouse_released_fn=partial(self._delete_logic_graph, graph),
                     )
-
+                    ui.Spacer(width=0)
             if self._paths and self._show_node_properties:
                 # A logic node is selected, so show node info
                 ui.Spacer(height=ui.Pixel(_SPACING_MD))
                 ui.Line(name="PropertiesPaneSectionTitle")
                 ui.Spacer(height=ui.Pixel(_SPACING_MD))
 
                 with ui.HStack(height=0, spacing=ui.Pixel(_SPACING_SM)):
-                    ui.Label("Node Type: ", name="PropertiesWidgetLabel", width=0)
-                    ui.Label(self._node_type_label_text, name="PropertiesWidgetLabel", width=0)
+                    ui.Label("Node Type", name="PropertiesWidgetLabel", height=0, width=0)
+                    ui.Spacer(width=0)
                     if self._node_type_tooltip_text:
-                        InfoIconWidget(self._node_type_tooltip_text, max_width=500)
-                    ui.Spacer()
+                        InfoIconWidget(self._node_type_tooltip_text)
+                        ui.Spacer(width=0)
+                ui.Spacer(height=ui.Pixel(_SPACING_SM))
+
+                ui.Label(self._node_type_label_text, name="PropertiesWidgetValue", width=0)
                 ui.Spacer(height=ui.Pixel(_SPACING_MD))
 
     def refresh(
@@ -645,12 +659,16 @@ def _create_logic_graphs(self, prim_paths: list[Sdf.Path]) -> None:
             raise ValueError(f"Received invalid prim at path {prim_paths[0]}")
         self._event_manager.call_global_custom_event(GlobalEventNames.LOGIC_GRAPH_CREATE_REQUEST.value, prim)
 
-    def _edit_logic_graph(self, graph: Usd.Prim) -> None:
+    def _edit_logic_graph(self, graph: Usd.Prim, x, y, b, m) -> None:
         """Edit the given logic graph."""
+        if b != 0:
+            return
         self._event_manager.call_global_custom_event(GlobalEventNames.LOGIC_GRAPH_EDIT_REQUEST.value, graph)
 
-    def _delete_logic_graph(self, graph: Usd.Prim) -> None:
+    def _delete_logic_graph(self, graph: Usd.Prim, x, y, b, m) -> None:
         """Delete the given logic graph."""
+        if b != 0:
+            return
         omni.kit.commands.execute("DeletePrimsCommand", paths=[str(graph.GetPath())])
         # Rebuild the UI to reflect the changes in the existing logic graphs
         if self._root_frame:
