diff --git a/editor/src/frontend/frontend_message_handler.rs b/editor/src/frontend/frontend_message_handler.rs index 535f066bb..1147076ff 100644 --- a/editor/src/frontend/frontend_message_handler.rs +++ b/editor/src/frontend/frontend_message_handler.rs @@ -13,6 +13,7 @@ pub enum FrontendMessage { SetActiveTool { tool_name: String }, SetActiveDocument { document_index: usize }, UpdateOpenDocumentsList { open_documents: Vec }, + DisplayError { description: String }, DisplayConfirmationToCloseDocument { document_index: usize }, DisplayConfirmationToCloseAllDocuments, UpdateCanvas { document: String }, @@ -42,6 +43,7 @@ impl MessageHandler for FrontendMessageHandler { advertise_actions!( FrontendMessageDiscriminant; + DisplayError, CollapseFolder, ExpandFolder, SetActiveTool, diff --git a/editor/src/input/input_mapper.rs b/editor/src/input/input_mapper.rs index 2f1023ff1..93d5a8a4a 100644 --- a/editor/src/input/input_mapper.rs +++ b/editor/src/input/input_mapper.rs @@ -87,17 +87,17 @@ macro_rules! entry { entry!{action=$action, message=InputMapperMessage::KeyUp(Key::$key) $(, modifiers=[$($m),* ])?} }}; {action=$action:expr, message=$message:expr $(, modifiers=[$($m:ident),* $(,)?])?} => {{ - &[MappingEntry {trigger: $message, modifiers: modifiers!($($($m),*)?), action: $action.into()}] + &[MappingEntry {trigger: $message, modifiers: modifiers!($($($m),*)?), action: $action.into()}] }}; {action=$action:expr, triggers=[$($m:ident),* $(,)?]} => {{ - &[ - MappingEntry {trigger:InputMapperMessage::PointerMove, action: $action.into(), modifiers: modifiers!()}, - $( - MappingEntry {trigger:InputMapperMessage::KeyDown(Key::$m), action: $action.into(), modifiers: modifiers!()}, - MappingEntry {trigger:InputMapperMessage::KeyUp(Key::$m), action: $action.into(), modifiers: modifiers!()}, - )* - ] - }}; + &[ + MappingEntry {trigger:InputMapperMessage::PointerMove, action: $action.into(), modifiers: modifiers!()}, + $( + MappingEntry {trigger:InputMapperMessage::KeyDown(Key::$m), action: $action.into(), modifiers: modifiers!()}, + MappingEntry {trigger:InputMapperMessage::KeyUp(Key::$m), action: $action.into(), modifiers: modifiers!()}, + )* + ] + }}; } macro_rules! mapping { //[$()*] => {{ @@ -107,17 +107,17 @@ macro_rules! mapping { let mut pointer_move: KeyMappingEntries = Default::default(); let mut mouse_scroll: KeyMappingEntries = Default::default(); $( - for entry in $entry { - let arr = match entry.trigger { - InputMapperMessage::KeyDown(key) => &mut key_down[key as usize], - InputMapperMessage::KeyUp(key) => &mut key_up[key as usize], - InputMapperMessage::PointerMove => &mut pointer_move, - InputMapperMessage::MouseScroll => &mut mouse_scroll, - }; - arr.push(entry.clone()); - } - )* - (key_up, key_down, pointer_move, mouse_scroll) + for entry in $entry { + let arr = match entry.trigger { + InputMapperMessage::KeyDown(key) => &mut key_down[key as usize], + InputMapperMessage::KeyUp(key) => &mut key_up[key as usize], + InputMapperMessage::PointerMove => &mut pointer_move, + InputMapperMessage::MouseScroll => &mut mouse_scroll, + }; + arr.push(entry.clone()); + } + )* + (key_up, key_down, pointer_move, mouse_scroll) }}; } diff --git a/frontend/src/components/panels/Document.vue b/frontend/src/components/panels/Document.vue index 38f17d618..3c26fe69d 100644 --- a/frontend/src/components/panels/Document.vue +++ b/frontend/src/components/panels/Document.vue @@ -212,7 +212,7 @@ import { defineComponent } from "vue"; import { makeModifiersBitfield } from "@/utilities/input"; import { ResponseType, registerResponseHandler, Response, UpdateCanvas, SetActiveTool, ExportDocument, SetCanvasZoom, SetCanvasRotation } from "@/utilities/response-handler"; import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets"; -import comingSoon from "@/utilities/coming-soon"; +import { comingSoon } from "@/utilities/errors"; import LayoutRow from "@/components/layout/LayoutRow.vue"; import LayoutCol from "@/components/layout/LayoutCol.vue"; diff --git a/frontend/src/components/widgets/inputs/MenuBarInput.vue b/frontend/src/components/widgets/inputs/MenuBarInput.vue index 319cd3570..8f8cebfc2 100644 --- a/frontend/src/components/widgets/inputs/MenuBarInput.vue +++ b/frontend/src/components/widgets/inputs/MenuBarInput.vue @@ -53,7 +53,7 @@