diff --git a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs index 699e898d..940fef7a 100644 --- a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs +++ b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs @@ -2714,6 +2714,7 @@ impl NodeGraphMessageHandler { let clippable = layer.can_be_clipped(network_interface.document_metadata()); let data = LayerPanelEntry { id: node_id, + reference: network_interface.reference(&node_id, &[]).and_then(|x| x.as_ref()).cloned().unwrap_or_default(), alias: network_interface.display_name(&node_id, &[]), in_selected_network: selection_network_path.is_empty(), children_allowed, diff --git a/editor/src/messages/portfolio/document/utility_types/nodes.rs b/editor/src/messages/portfolio/document/utility_types/nodes.rs index b98b9e91..de2aac20 100644 --- a/editor/src/messages/portfolio/document/utility_types/nodes.rs +++ b/editor/src/messages/portfolio/document/utility_types/nodes.rs @@ -34,6 +34,7 @@ impl serde::Serialize for JsRawBuffer { #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq, specta::Type)] pub struct LayerPanelEntry { pub id: NodeId, + pub reference: String, pub alias: String, #[serde(rename = "inSelectedNetwork")] pub in_selected_network: bool, diff --git a/editor/src/messages/tool/utility_types.rs b/editor/src/messages/tool/utility_types.rs index 052926cf..d5af8492 100644 --- a/editor/src/messages/tool/utility_types.rs +++ b/editor/src/messages/tool/utility_types.rs @@ -134,12 +134,12 @@ impl DocumentToolData { LayoutGroup::Row { widgets: vec![ IconButton::new("SwapVertical", 16) - .tooltip_label("Swap") + .tooltip_label("Swap Working Colors") .tooltip_shortcut(action_shortcut!(ToolMessageDiscriminant::SwapColors)) .on_update(|_| ToolMessage::SwapColors.into()) .widget_instance(), IconButton::new("WorkingColors", 16) - .tooltip_label("Reset") + .tooltip_label("Reset Working Colors") .tooltip_shortcut(action_shortcut!(ToolMessageDiscriminant::ResetColors)) .on_update(|_| ToolMessage::ResetColors.into()) .widget_instance(), diff --git a/frontend/src/components/panels/Layers.svelte b/frontend/src/components/panels/Layers.svelte index 9115a9ea..e7c64b54 100644 --- a/frontend/src/components/panels/Layers.svelte +++ b/frontend/src/components/panels/Layers.svelte @@ -644,15 +644,15 @@ {@html $nodeGraph.thumbnails.get(listing.entry.id)} {/if} - {#if listing.entry.name === "Artboard"} - + {#if listing.entry.reference === "Artboard"} + {/if} onEditLayerName(listing)}> onEditLayerNameDeselect(listing)} on:keydown={(e) => e.key === "Escape" && onEditLayerNameDeselect(listing)} @@ -842,7 +842,6 @@ } .layer-type-icon { - flex: 0 0 auto; margin-left: 8px; margin-right: -4px; } diff --git a/frontend/src/components/widgets/inputs/NumberInput.svelte b/frontend/src/components/widgets/inputs/NumberInput.svelte index 830fb1d8..fe802bb1 100644 --- a/frontend/src/components/widgets/inputs/NumberInput.svelte +++ b/frontend/src/components/widgets/inputs/NumberInput.svelte @@ -745,10 +745,6 @@ diff --git a/frontend/src/messages.ts b/frontend/src/messages.ts index 29eb3743..4296acca 100644 --- a/frontend/src/messages.ts +++ b/frontend/src/messages.ts @@ -827,13 +827,10 @@ export class UpdateDocumentLayerDetails extends JsMessage { export class LayerPanelEntry { id!: bigint; - name!: string; + reference!: string; alias!: string; - @Transform(({ value }: { value: string }) => value || undefined) - debugLayerIdTooltip!: string | undefined; - inSelectedNetwork!: boolean; childrenAllowed!: boolean;