Rename PropertyHolder to LayoutHolder

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -5,7 +5,6 @@ use crate::consts::{ASYMPTOTIC_EFFECT, DEFAULT_DOCUMENT_NAME, FILE_SAVE_SUFFIX,
 use crate::messages::frontend::utility_types::ExportBounds;
 use crate::messages::frontend::utility_types::FileType;
 use crate::messages::input_mapper::utility_types::macros::action_keys;
-use crate::messages::layout::utility_types::misc::LayoutTarget;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::properties_panel::utility_types::PropertiesPanelMessageHandlerData;
 use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -160,7 +160,7 @@ impl NodeGraphMessageHandler {
 	fn send_node_bar_layout(&self, responses: &mut VecDeque<Message>) {
 		responses.add(LayoutMessage::SendLayout {
 			layout: Layout::WidgetLayout(WidgetLayout::new(self.widgets.to_vec())),
-			layout_target: crate::messages::layout::utility_types::misc::LayoutTarget::NodeGraphBar,
+			layout_target: LayoutTarget::NodeGraphBar,
 		});
 	}
 

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs

@@ -1,6 +1,6 @@
 use super::{node_properties, FrontendGraphDataType, FrontendNodeType};
 use crate::consts::{DEFAULT_FONT_FAMILY, DEFAULT_FONT_STYLE};
-use crate::messages::layout::utility_types::layout_widget::LayoutGroup;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::node_graph_executor::NodeGraphExecutor;
 
 use graph_craft::concrete;

editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs

@@ -1,5 +1,5 @@
 use super::utility_types::TransformOp;
-use crate::messages::layout::utility_types::widgets::assist_widgets::PivotPosition;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::misc::TargetDocument;
 use crate::messages::prelude::*;
 

editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs

@@ -1,7 +1,6 @@
 use super::utility_functions::{register_artboard_layer_properties, register_artwork_layer_properties, register_document_graph_properties};
 use super::utility_types::PropertiesPanelMessageHandlerData;
-use crate::messages::layout::utility_types::layout_widget::{Layout, WidgetLayout};
-use crate::messages::layout::utility_types::misc::LayoutTarget;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::properties_panel::utility_functions::apply_transform_operation;
 use crate::messages::portfolio::document::utility_types::misc::TargetDocument;
 use crate::messages::portfolio::utility_types::PersistentData;

editor/src/messages/portfolio/document/properties_panel/utility_functions.rs

@@ -1,6 +1,5 @@
 use super::utility_types::TransformOp;
 use crate::application::generate_uuid;
-use crate::messages::layout::utility_types::misc::LayoutTarget;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::NodePropertiesContext;
 use crate::messages::portfolio::utility_types::PersistentData;

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -1,7 +1,5 @@
 use crate::messages::input_mapper::utility_types::macros::action_keys;
-use crate::messages::layout::utility_types::layout_widget::{Layout, PropertyHolder};
-use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::menu_widgets::{MenuBarEntry, MenuBarEntryChildren, MenuLayout};
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
 use crate::messages::prelude::*;
 
@@ -18,7 +16,7 @@ impl MessageHandler<MenuBarMessage, bool> for MenuBarMessageHandler {
 
 		#[remain::sorted]
 		match message {
-			SendLayout => self.register_properties(responses, LayoutTarget::MenuBar),
+			SendLayout => self.send_layout(responses, LayoutTarget::MenuBar),
 		}
 	}
 
@@ -27,8 +25,8 @@ impl MessageHandler<MenuBarMessage, bool> for MenuBarMessageHandler {
 	}
 }
 
-impl PropertyHolder for MenuBarMessageHandler {
-	fn properties(&self) -> Layout {
+impl LayoutHolder for MenuBarMessageHandler {
+	fn layout(&self) -> Layout {
 		let no_active_document = self.no_active_document;
 		let menu_bar_entries = vec![
 			MenuBarEntry {

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -3,8 +3,7 @@ use crate::application::generate_uuid;
 use crate::consts::{DEFAULT_DOCUMENT_NAME, GRAPHITE_DOCUMENT_VERSION};
 use crate::messages::dialog::simple_dialogs;
 use crate::messages::frontend::utility_types::FrontendDocumentDetails;
-use crate::messages::layout::utility_types::layout_widget::PropertyHolder;
-use crate::messages::layout::utility_types::misc::LayoutTarget;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::clipboards::{Clipboard, CopyBufferEntry, INTERNAL_CLIPBOARD_COUNT};
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::{HintData, HintGroup};
@@ -138,7 +137,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 						document_name: target_document.name.clone(),
 						document_id,
 					};
-					dialog.register_properties(responses, LayoutTarget::DialogDetails);
+					dialog.send_layout(responses, LayoutTarget::DialogDetails);
 					responses.add(FrontendMessage::DisplayDialog { icon: "File".to_string() });
 
 					// Select the document being closed