Merge branch 'dev/e-man/logic-prop-panel-improvements' into 'main'

Smaller UX improvements for the properties panels.

See merge request lightspeedrtx/lightspeed-kit!1048

Author: Emanuel Kozerski

CHANGELOG.md

@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Set build jobs to run against GPU agents
 - Fixed code formatting and lint errors across multiple extensions
 - REMIX-4593: Fixed logic graph and particle properties panel not preserving expansion state across refreshes
+- Improved a few UX issues with the Logic Properties pane
 
 ### Removed
 - Removed Waypoint support based on deprecated kit sample waypoint extension

source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml

@@ -1,5 +1,5 @@
 [package]
-version = "1.2.1"
+version = "1.2.2"
 authors = ["Nicolas Kendall-Bar <[email protected]>"]
 title = "Remix Logic Properties Widget"
 description = "Properties panel for RemixLogic prim types"
@@ -18,6 +18,7 @@ icon = "data/images/icon.png"
 "lightspeed.trex.utils.common" = {}
 "lightspeed.trex.logic.core" = {}
 "lightspeed.trex.logic.ogn" = {}
+"omni.flux.info_icon.widget" = {}
 "omni.flux.property_widget_builder.model.usd" = {}
 "omni.flux.property_widget_builder.widget" = {}
 "omni.flux.utils.common" = {}

source/extensions/lightspeed.trex.properties_pane.logic.widget/docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.2.2]
+### Changed
+- Improved node type description display in properties panel
+
 ## [1.2.1]
 ### Added
 - Added StagePrimPicker integration for OmniGraph target relationship inputs

source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/setup_ui.py

@@ -31,6 +31,8 @@
 from lightspeed.common.constants import OMNI_GRAPH_NODE_TYPE, REGEX_MESH_TO_INSTANCE_SUB, GlobalEventNames
 from lightspeed.events_manager import get_instance as _get_event_manager_instance
 from lightspeed.trex.logic.core.graphs import LogicGraphCore
+from omni.flux.info_icon.widget import InfoIconWidget
+from omni.flux.property_widget_builder.delegates.string_value.file_picker import FilePicker
 from omni.flux.property_widget_builder.model.usd import USDAttributeItem, USDAttrListItem
 from omni.flux.property_widget_builder.model.usd import USDDelegate as _USDPropertyDelegate
 from omni.flux.property_widget_builder.model.usd import USDModel as _USDPropertyModel
@@ -39,13 +41,14 @@
     USDRelationshipItem,
     get_usd_listener_instance,
 )
+from omni.flux.property_widget_builder.model.usd.field_builders.ogn import is_ogn_node_attr
 from omni.flux.property_widget_builder.model.usd.utils import is_property_relationship
 from omni.flux.property_widget_builder.widget import FieldBuilder, ItemGroup
 from omni.flux.utils.common import Event, EventSubscription
 from omni.flux.utils.common.icons import get_prim_type_icons as _get_prim_type_icons
 from pxr import Sdf, Usd
 
-LOGIC_ATTR_GROUP_ORDER = ("Inputs", "Outputs", "State", "Node", "Other")
+LOGIC_ATTR_GROUP_ORDER = ("Inputs", "Outputs", "State", "Other")
 LOGIC_ATTR_GROUP_FALLBACK = "Other"
 
 # Attribute name prefixes
@@ -55,6 +58,18 @@
 OGN_ATTR_PREFIX_STATE = "state:"
 OGN_ATTR_PREFIX_UI = "ui:"
 
+
+def _is_const_asset_path_value(item) -> bool:
+    """Check if item is ConstAssetPath.value attribute."""
+    return is_ogn_node_attr(item, "lightspeed.trex.logic.ConstAssetPath", "inputs:value")
+
+
+# Field builder for ConstAssetPath.value - uses FilePicker instead of string field
+CONST_ASSET_PATH_FIELD_BUILDER = FieldBuilder(
+    claim_func=_is_const_asset_path_value,
+    build_func=FilePicker().build_ui,
+)
+
 _SPACING_SM = 4
 _SPACING_MD = 8
 _ICON_SIZE = 16
@@ -142,6 +157,7 @@ def __init__(
 
         self._node_type_label_text: str = ""
         self._node_type_label_description_text: str = ""
+        self._node_type_tooltip_text: str = ""
 
         self._context_name = context_name
         self._context = omni.usd.get_context(context_name)
@@ -159,7 +175,12 @@ def __init__(
 
         self._lookup_table = lookup_table or {}
 
-        self.__create_ui(field_builders=field_builders)
+        # Add ConstAssetPath file picker to field builders
+        all_field_builders = [CONST_ASSET_PATH_FIELD_BUILDER]
+        if field_builders:
+            all_field_builders.extend(field_builders)
+
+        self.__create_ui(field_builders=all_field_builders)
 
     def _refresh_done(self) -> None:
         """Call the event object that has the list of functions."""
@@ -320,13 +341,12 @@ def _build_dynamic_content(self) -> None:
                 ui.Line(name="PropertiesPaneSectionTitle")
                 ui.Spacer(height=ui.Pixel(_SPACING_MD))
 
-                with ui.VStack(height=0, spacing=ui.Pixel(_SPACING_MD)):
-                    ui.Label(f"Node Type: {self._node_type_label_text}", name="PropertiesWidgetLabel")
-                    if self._node_type_label_description_text:
-                        ui.Label(
-                            self._node_type_label_description_text,
-                            word_wrap=True,
-                        )
+                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)
+                    if self._node_type_tooltip_text:
+                        InfoIconWidget(self._node_type_tooltip_text, max_width=500)
+                    ui.Spacer()
                 ui.Spacer(height=ui.Pixel(_SPACING_MD))
 
     def refresh(
@@ -380,6 +400,7 @@ async def _deferred_refresh(
 
         self._node_type_label_text = "No valid node type selected"
         self._node_type_label_description_text = ""
+        self._node_type_tooltip_text = ""
 
         node_types: list[og.NodeType] = []
 
@@ -410,16 +431,33 @@ async def _deferred_refresh(
                     # Filter for logic graph relevant attributes
                     if attr_name.startswith(OGN_ATTR_PREFIX_UI):
                         continue
+                    # Skip node: attributes (type, version info shown in tooltip instead)
+                    if attr_name.startswith(OGN_ATTR_PREFIX_NODE):
+                        continue
 
                     # Group attributes by name across all prims
                     attr_added.setdefault(attr_name, []).append((prim, attr))
 
-            # Get text for the node type description
+            # Get text for the node type info
             # Dedupe with a set of node type names because node type is not hashable
             node_type_names = {node_type.get_node_type() for node_type in node_types}
             if len(node_type_names) == 1:
-                self._node_type_label_text = node_types[0].get_metadata(ogn.MetadataKeys.UI_NAME)
-                self._node_type_label_description_text = node_types[0].get_metadata(ogn.MetadataKeys.DESCRIPTION)
+                node_type = node_types[0]
+                self._node_type_label_text = node_type.get_metadata(ogn.MetadataKeys.UI_NAME)
+                # Build tooltip with description and node type info
+                description = node_type.get_metadata(ogn.MetadataKeys.DESCRIPTION) or ""
+                self._node_type_label_description_text = description
+                full_type_name = node_type.get_node_type()
+                # Get version from node:typeVersion attribute on the prim
+                version = stage.GetPrimAtPath(valid_paths[0]).GetAttribute("node:typeVersion").Get(0)
+                # Build tooltip text
+                tooltip_parts = []
+                if description:
+                    tooltip_parts.append(description)
+                    tooltip_parts.append("\n---\n")
+                tooltip_parts.append(f"Node Internal Name: {full_type_name}")
+                tooltip_parts.append(f"Node Version: {version}")
+                self._node_type_tooltip_text = "\n".join(tooltip_parts)
             elif len(node_type_names) > 1:
                 self._node_type_label_text = "Multiple node types selected"
 
@@ -461,8 +499,6 @@ async def _deferred_refresh(
                         group_name = "Outputs"
                     elif attr_name.startswith(OGN_ATTR_PREFIX_STATE):
                         group_name = "State"
-                    elif attr_name.startswith(OGN_ATTR_PREFIX_NODE):
-                        group_name = "Node"
                     else:
                         group_name = LOGIC_ATTR_GROUP_FALLBACK
                 if not tooltip:

source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/tests/e2e/test_prim_picker_ui.py

@@ -144,7 +144,6 @@ async def test_ui_creates_relationship_item_and_renders_picker(self):
         # Arrange
         context = omni.usd.get_context()
         stage = context.get_stage()
-
         controller = og.Controller(undoable=False)
         _, (node,), _, _ = controller.edit(
             "/World/LogicGraph",
@@ -155,7 +154,6 @@ async def test_ui_creates_relationship_item_and_renders_picker(self):
             },
         )
         await controller.evaluate()
-
         window = ui.Window("TestUI", height=600, width=400)
         with window.frame:
             with ui.Frame(width=400, height=600):
@@ -194,7 +192,6 @@ async def test_ui_multiselect_different_targets_shows_mixed(self):
         # Arrange
         context = omni.usd.get_context()
         stage = context.get_stage()
-
         controller = og.Controller(undoable=False)
         _, (node1, node2), _, _ = controller.edit(
             "/World/LogicGraph",
@@ -218,7 +215,6 @@ async def test_ui_multiselect_different_targets_shows_mixed(self):
             with ui.Frame(width=400, height=600):
                 widget = LogicPropertyWidget("")
                 widget.show(True)
-
         # Act
         widget.refresh([node1_prim, node2_prim])
         await omni.kit.app.get_app().next_update_async()
@@ -250,7 +246,6 @@ async def test_ui_multiselect_set_value_updates_both_nodes(self):
         context = omni.usd.get_context()
         stage = context.get_stage()
         stage.DefinePrim("/World/CommonMesh", "Mesh")
-
         controller = og.Controller(undoable=False)
         _, (node1, node2), _, _ = controller.edit(
             "/World/LogicGraph",
@@ -262,7 +257,6 @@ async def test_ui_multiselect_set_value_updates_both_nodes(self):
             },
         )
         await controller.evaluate()
-
         window = ui.Window("TestUI", height=600, width=400)
         with window.frame:
             with ui.Frame(width=400, height=600):
@@ -304,7 +298,6 @@ async def test_ui_set_target_and_verify_persistence(self):
         context = omni.usd.get_context()
         stage = context.get_stage()
         stage.DefinePrim("/World/TestMesh", "Mesh")
-
         controller = og.Controller(undoable=False)
         _, (node,), _, _ = controller.edit(
             "/World/LogicGraph",
@@ -315,13 +308,11 @@ async def test_ui_set_target_and_verify_persistence(self):
             },
         )
         await controller.evaluate()
-
         window = ui.Window("TestUI", height=600, width=400)
         with window.frame:
             with ui.Frame(width=400, height=600):
                 widget = LogicPropertyWidget("")
                 widget.show(True)
-
         node_prim = stage.GetPrimAtPath(node.get_prim_path())
         widget.refresh([node_prim])
         await omni.kit.app.get_app().next_update_async()

source/extensions/lightspeed.trex.properties_pane.widget/config/extension.toml

@@ -1,5 +1,5 @@
 [package]
-version = "1.14.2"
+version = "1.14.3"
 authors =["Damien Bataille <[email protected]>"]
 title = "NVIDIA RTX Remix Properties Pane Asset Replacements widget for the StageCraft"
 description = "Asset Replacements Properties Pane widget for NVIDIA RTX Remix StageCraft App"

source/extensions/lightspeed.trex.properties_pane.widget/docs/CHANGELOG.md

@@ -2,6 +2,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [1.14.3]
+### Changed
+- Enabled horizontal scrollbar in the Properties pane
+
 ## [1.14.2]
 ### Changed
 - Integrated LogicGraphCore for consistent graph root prim detection

source/extensions/lightspeed.trex.properties_pane.widget/lightspeed/trex/properties_pane/widget/setup_ui.py

@@ -143,7 +143,6 @@ def __create_ui(self):
         with self.root_widget:
             with ui.ScrollingFrame(
                 name="WorkspaceBackground",
-                horizontal_scrollbar_policy=ui.ScrollBarPolicy.SCROLLBAR_ALWAYS_OFF,
             ):
                 with ui.VStack():
                     ui.Spacer(height=ui.Pixel(5))

source/extensions/omni.flux.info_icon.widget/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versionning is used: https://semver.org/
-version = "1.3.2"
+version = "1.4.0"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["Alex Dunn <[email protected]>"]

source/extensions/omni.flux.info_icon.widget/docs/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.4.0]
+### Added
+- Added optional `max_width` parameter for tooltip width constraint with word wrap
+
 ## [1.3.2]
 ### Changed
 - Updated tooltip window styling with explicit padding values