Fix some paper cuts

This commit is contained in:
Keavon Chambers 2022-12-22 23:53:36 -08:00
parent efd4da616d
commit 54f438642b
7 changed files with 17 additions and 12 deletions

View file

@ -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 {

View file

@ -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()
})),
],

View file

@ -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,

View file

@ -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 {

View file

@ -133,6 +133,8 @@
flex: 0 0 auto;
.widget-row {
min-height: 0;
.swatch-pair {
margin: 0;
}

View file

@ -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";

View file

@ -18,7 +18,7 @@
</LayoutRow>
<PopoverButton :icon="'VerticalEllipsis'">
<TextLabel :bold="true">Panel Options</TextLabel>
<TextLabel :multiline="true">The contents of this popover menu are coming soon</TextLabel>
<TextLabel :multiline="true">Coming soon</TextLabel>
</PopoverButton>
</LayoutRow>
<LayoutCol class="panel-body">