Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo-artwork/changing-seasons.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/isometric-fountain.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/marbled-mandelbrot.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/painted-dreams.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/parametric-dunescape.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/procedural-string-lights.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/red-dress.graphite

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-artwork/valley-of-spires.graphite

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions editor/src/dispatcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ const SIDE_EFFECT_FREE_MESSAGES: &[MessageDiscriminant] = &[
/// Since we don't need to update the frontend multiple times per frame,
/// we have a set of messages which we will buffer until the next frame is requested.
const FRONTEND_UPDATE_MESSAGES: &[MessageDiscriminant] = &[
MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::PropertiesPanel(
PropertiesPanelMessageDiscriminant::Refresh,
))),
MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::Inspector(InspectorMessageDiscriminant::Refresh))),
MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::UpdateDocumentWidgets),
MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::Overlays(OverlaysMessageDiscriminant::Draw))),
MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::RenderRulers)),
Expand Down Expand Up @@ -288,7 +286,7 @@ impl Dispatcher {
let layout = &self.message_handlers.portfolio_message_handler.workspace.panel_layout;
menu_bar_message_handler.data_panel_open = layout.is_panel_present(PanelType::Data);
menu_bar_message_handler.layers_panel_open = layout.is_panel_present(PanelType::Layers);
menu_bar_message_handler.properties_panel_open = layout.is_panel_present(PanelType::Properties);
menu_bar_message_handler.inspector_open = layout.is_panel_present(PanelType::Inspector);
menu_bar_message_handler.message_logging_verbosity = self.message_handlers.debug_message_handler.message_logging_verbosity;
menu_bar_message_handler.reset_node_definitions_on_open = self.message_handlers.portfolio_message_handler.reset_node_definitions_on_open;
menu_bar_message_handler.show_storage_preferences = self.message_handlers.preferences_message_handler.show_storage_preferences;
Expand Down
2 changes: 1 addition & 1 deletion editor/src/messages/layout/layout_message_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ impl LayoutMessageHandler {
}
}
// A section contains more LayoutGroups which we add to the stack.
LayoutGroup::Section(WidgetSection { layout, .. }) => {
LayoutGroup::NodeSection(NodeSection { layout, .. }) => {
stack.extend(layout.0.iter().enumerate().map(|(index, val)| ([widget_path.as_slice(), &[index]].concat(), val)));
}
LayoutGroup::Table(WidgetTable { rows, .. }) => {
Expand Down
36 changes: 18 additions & 18 deletions editor/src/messages/layout/utility_types/layout_widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ define_layout_target!(
MenuBar,
/// Bar at the top of the node graph containing the location and the "Preview" and "Hide" buttons.
NodeGraphControlBar,
/// The body of the Properties panel containing many collapsable sections.
PropertiesPanel,
/// The body of the Inspector containing many collapsable sections.
Inspector,
/// The contextual input key/mouse combination shortcuts shown in the status bar at the bottom of the window.
StatusBarHints,
/// The version information shown in the status bar at the bottom right of the window.
Expand Down Expand Up @@ -295,7 +295,7 @@ impl<'a> Iterator for WidgetIter<'a> {
self.table.extend(rows.iter().flatten().flatten().rev());
self.next()
}
Some(LayoutGroup::Section(WidgetSection { layout, .. })) => {
Some(LayoutGroup::NodeSection(NodeSection { layout, .. })) => {
for layout_row in &layout.0 {
self.stack.push(layout_row);
}
Expand Down Expand Up @@ -347,7 +347,7 @@ impl<'a> Iterator for WidgetIterMut<'a> {
self.table.extend(rows.iter_mut().flatten().flatten().rev());
self.next()
}
Some(LayoutGroup::Section(WidgetSection { layout, .. })) => {
Some(LayoutGroup::NodeSection(NodeSection { layout, .. })) => {
for layout_row in &mut layout.0 {
self.stack.push(layout_row);
}
Expand All @@ -364,7 +364,7 @@ pub enum LayoutGroup {
Column(WidgetColumn),
Row(WidgetRow),
Table(WidgetTable),
Section(WidgetSection),
NodeSection(NodeSection),
}

#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
Expand All @@ -390,7 +390,7 @@ pub struct WidgetTable {
pub unstyled: bool,
}

/// A wire drawn between Properties panel sections, styled like the graph's wire carrying the same data.
/// A wire drawn between Inspector sections, styled like the graph's wire carrying the same data.
#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
pub struct SectionWire {
Expand All @@ -401,10 +401,10 @@ pub struct SectionWire {
pub is_list: bool,
}

/// A collapsible Properties panel section for a single node: a header with its name and pin, delete, and visibility controls, above its input parameter widgets.
/// A collapsible Inspector section for a single node: a header with its name and pin, delete, and visibility controls, above its input parameter widgets.
#[cfg_attr(feature = "wasm", derive(tsify::Tsify), tsify(large_number_types_as_bigints))]
#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
pub struct WidgetSection {
pub struct NodeSection {
/// The node's name shown in the section header: its implementation name, followed in parentheses by its given alias if it has one.
pub name: String,
/// The node definition's icon, shown before the name in the section header (none when it has no icon).
Expand All @@ -413,7 +413,7 @@ pub struct WidgetSection {
pub description: String,
/// Whether the node is visible rather than hidden (shown as the eye icon).
pub visible: bool,
/// Whether the node is pinned, keeping its section shown in the Properties panel when nothing is selected (shown as the pin icon).
/// Whether the node is pinned, keeping its section shown in the Inspector when nothing is selected (shown as the pin icon).
pub pinned: bool,
/// Whether this section can be dragged to reorder it within its layer's chain of nodes (true for a layer chain's nodes, but not its terminal layer node).
pub draggable: bool,
Expand All @@ -428,9 +428,9 @@ pub struct WidgetSection {
pub node_reference: bool,
/// Whether this section is expanded to show its contents, as opposed to being collapsed down to just its header.
pub expanded: bool,
/// The ID of the node whose properties this section displays.
/// The ID of the node whose Inspector section this is.
pub id: u64,
/// The node's properties content, rendered as the section's body when expanded, followed by the sections of any chain it shows (those with an `output_wire`).
/// The node's Inspector content, rendered as the section's body when expanded, followed by the sections of any chain it shows (those with an `output_wire`).
pub layout: Layout,
}

Expand Down Expand Up @@ -467,7 +467,7 @@ impl LayoutGroup {

#[allow(clippy::too_many_arguments)]
pub fn section(name: impl Into<String>, icon: Option<IconName>, description: impl Into<String>, visible: bool, pinned: bool, expanded: bool, id: u64, layout: Layout) -> Self {
Self::Section(WidgetSection {
Self::NodeSection(NodeSection {
name: name.into(),
icon,
description: description.into(),
Expand Down Expand Up @@ -572,7 +572,7 @@ impl Diffable for LayoutGroup {
}
}
(
Self::Section(WidgetSection {
Self::NodeSection(NodeSection {
name: current_name,
icon: current_icon,
description: current_description,
Expand All @@ -586,7 +586,7 @@ impl Diffable for LayoutGroup {
id: current_id,
layout: current_layout,
}),
Self::Section(WidgetSection {
Self::NodeSection(NodeSection {
name: new_name,
icon: new_icon,
description: new_description,
Expand Down Expand Up @@ -631,7 +631,7 @@ impl Diffable for LayoutGroup {
current_layout.clone_from(&new_layout);

// Push an update layout group to the diff
let new_value = Self::Section(WidgetSection {
let new_value = Self::NodeSection(NodeSection {
name: new_name,
icon: new_icon,
description: new_description,
Expand Down Expand Up @@ -691,7 +691,7 @@ impl Diffable for LayoutGroup {
}
}
}
Self::Section(WidgetSection { layout, .. }) => {
Self::NodeSection(NodeSection { layout, .. }) => {
layout.collect_checkbox_ids(layout_target, widget_path, checkbox_map);
}
}
Expand Down Expand Up @@ -721,7 +721,7 @@ impl Diffable for LayoutGroup {
}
}
}
Self::Section(WidgetSection { layout, .. }) => {
Self::NodeSection(NodeSection { layout, .. }) => {
layout.replace_widget_ids(layout_target, widget_path, checkbox_map);
}
}
Expand Down Expand Up @@ -973,7 +973,7 @@ impl WidgetSizing {
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct WidgetDiff {
/// A path to the change
/// e.g. [0, 1, 2] in the Properties panel is the first section, second row and third widget.
/// e.g. [0, 1, 2] in the Inspector is the first section, second row and third widget.
/// An empty path [] shows that the entire panel has changed and is sent when the UI is first created.
#[serde(rename = "widgetPath")]
pub widget_path: Vec<usize>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ pub struct ParameterExposeButton {
pub on_commit: WidgetCallback<()>,
}

/// A parameter's name, for an input fed by a chain of nodes, that shows or hides that chain's sections within its node's Properties panel section.
/// A parameter's name, for an input fed by a chain of nodes, that shows or hides that chain's sections within its node's Inspector section.
#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
#[derive(Clone, serde::Serialize, serde::Deserialize, Derivative, Default, WidgetBuilder)]
#[derivative(Debug, PartialEq)]
Expand Down
12 changes: 6 additions & 6 deletions editor/src/messages/menu_bar/menu_bar_message_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub struct MenuBarMessageHandler {
pub make_path_editable_is_allowed: bool,
pub data_panel_open: bool,
pub layers_panel_open: bool,
pub properties_panel_open: bool,
pub inspector_open: bool,
pub focus_document: bool,
}

Expand Down Expand Up @@ -669,11 +669,11 @@ impl LayoutHolder for MenuBarMessageHandler {
.on_commit(|_| WorkspaceMessage::ResetWorkspaceLayout.into()),
],
vec![
MenuListEntry::new("Properties")
.label("Properties")
.icon(if self.properties_panel_open { "CheckboxChecked" } else { "CheckboxUnchecked" })
.tooltip_shortcut(action_shortcut!(WorkspaceMessageDiscriminant::TogglePropertiesPanelOpen))
.on_commit(|_| WorkspaceMessage::TogglePropertiesPanelOpen.into())
MenuListEntry::new("Inspector")
.label("Inspector")
.icon(if self.inspector_open { "CheckboxChecked" } else { "CheckboxUnchecked" })
.tooltip_shortcut(action_shortcut!(WorkspaceMessageDiscriminant::ToggleInspectorOpen))
.on_commit(|_| WorkspaceMessage::ToggleInspectorOpen.into())
.disabled(self.focus_document),
MenuListEntry::new("Layers")
.label("Layers")
Expand Down
8 changes: 4 additions & 4 deletions editor/src/messages/portfolio/document/document_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub enum DocumentMessage {
#[child]
Overlays(OverlaysMessage),
#[child]
PropertiesPanel(PropertiesPanelMessage),
Inspector(InspectorMessage),
#[child]
DataPanel(DataPanelMessage),
#[child]
Expand Down Expand Up @@ -104,7 +104,7 @@ pub enum DocumentMessage {
parent: LayerNodeIdentifier,
insert_index: usize,
},
ReorderPropertiesSection {
ReorderInspectorSection {
node_id: NodeId,
insert_index: usize,
duplicate: bool,
Expand Down Expand Up @@ -249,11 +249,11 @@ pub enum DocumentMessage {
tree_path: Vec<NodeId>,
recursive: bool,
},
ToggleNodePropertiesSectionExpanded {
ToggleNodeInspectorSectionExpanded {
node_id: NodeId,
recursive: bool,
},
ToggleNodePropertiesInputChain {
ToggleNodeInspectorInputChain {
node_id: NodeId,
input_index: usize,
},
Expand Down
Loading
Loading