diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 175fafe3..b07e3965 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -1032,7 +1032,7 @@ impl DocumentMessageHandler { document.name = name; Ok(document) } - Err(DocumentError::InvalidFile(msg)) => Err(EditorError::Document(msg)), + Err(DocumentError::InvalidFile(msg)) => Err(EditorError::DocumentDeserialization(msg)), _ => Err(EditorError::Document(String::from("Failed to open file"))), } } @@ -1508,7 +1508,7 @@ impl DocumentMessageHandler { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Snapping".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { @@ -1524,7 +1524,7 @@ impl DocumentMessageHandler { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Grid".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { @@ -1540,7 +1540,7 @@ impl DocumentMessageHandler { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Overlays".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { @@ -1576,7 +1576,7 @@ impl DocumentMessageHandler { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "View Mode".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { diff --git a/editor/src/messages/portfolio/document/properties_panel/utility_functions.rs b/editor/src/messages/portfolio/document/properties_panel/utility_functions.rs index f351ff92..ca6eafc7 100644 --- a/editor/src/messages/portfolio/document/properties_panel/utility_functions.rs +++ b/editor/src/messages/portfolio/document/properties_panel/utility_functions.rs @@ -59,7 +59,7 @@ pub fn register_artboard_layer_properties(layer: &Layer, responses: &mut VecDequ WidgetHolder::related_separator(), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Options Bar".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), ], @@ -261,7 +261,7 @@ pub fn register_artwork_layer_properties( WidgetHolder::related_separator(), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Options Bar".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), ], diff --git a/editor/src/messages/portfolio/document/utility_types/error.rs b/editor/src/messages/portfolio/document/utility_types/error.rs index e47cabf3..6ac1737e 100644 --- a/editor/src/messages/portfolio/document/utility_types/error.rs +++ b/editor/src/messages/portfolio/document/utility_types/error.rs @@ -18,6 +18,9 @@ pub enum EditorError { #[error("The operation caused a document error:\n{0:?}")] Document(String), + #[error("This document was created in an older version of the editor.\n\nBackwards compatibility is, regrettably, not present in the current alpha release.\n\nTechnical details:\n{0:?}")] + DocumentDeserialization(String), + #[error("A rollback was initiated but no transaction was in progress")] NoTransactionInProgress, diff --git a/editor/src/messages/tool/tool_messages/select_tool.rs b/editor/src/messages/tool/tool_messages/select_tool.rs index 9845bebf..e886fb3c 100644 --- a/editor/src/messages/tool/tool_messages/select_tool.rs +++ b/editor/src/messages/tool/tool_messages/select_tool.rs @@ -173,7 +173,7 @@ impl PropertyHolder for SelectTool { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Align".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { @@ -200,7 +200,7 @@ impl PropertyHolder for SelectTool { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Flip".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { @@ -248,7 +248,7 @@ impl PropertyHolder for SelectTool { })), WidgetHolder::new(Widget::PopoverButton(PopoverButton { header: "Boolean".into(), - text: "The contents of this popover menu are coming soon".into(), + text: "Coming soon".into(), ..Default::default() })), WidgetHolder::new(Widget::Separator(Separator { diff --git a/frontend/src/components/panels/Document.vue b/frontend/src/components/panels/Document.vue index b2b9dfa8..6c7cc5ae 100644 --- a/frontend/src/components/panels/Document.vue +++ b/frontend/src/components/panels/Document.vue @@ -133,6 +133,8 @@ flex: 0 0 auto; .widget-row { + min-height: 0; + .swatch-pair { margin: 0; } diff --git a/frontend/src/components/panels/NodeGraph.vue b/frontend/src/components/panels/NodeGraph.vue index 02e611a2..1b806b02 100644 --- a/frontend/src/components/panels/NodeGraph.vue +++ b/frontend/src/components/panels/NodeGraph.vue @@ -300,7 +300,7 @@ import { defineComponent, nextTick } from "vue"; import type { IconName } from "@/utility-functions/icons"; -import { UpdateNodeGraphSelection, FrontendNodeLink } from "@/wasm-communication/messages"; +import { UpdateNodeGraphSelection, type FrontendNodeLink } from "@/wasm-communication/messages"; import LayoutCol from "@/components/layout/LayoutCol.vue"; import LayoutRow from "@/components/layout/LayoutRow.vue"; diff --git a/frontend/src/components/window/workspace/Panel.vue b/frontend/src/components/window/workspace/Panel.vue index 759ae836..027496b1 100644 --- a/frontend/src/components/window/workspace/Panel.vue +++ b/frontend/src/components/window/workspace/Panel.vue @@ -18,7 +18,7 @@ Panel Options - The contents of this popover menu are coming soon + Coming soon