diff --git a/editor/src/document/document_message_handler.rs b/editor/src/document/document_message_handler.rs index 0fdf30a8..2d391886 100644 --- a/editor/src/document/document_message_handler.rs +++ b/editor/src/document/document_message_handler.rs @@ -25,6 +25,7 @@ pub enum DocumentsMessage { CloseActiveDocumentWithConfirmation, CloseAllDocumentsWithConfirmation, CloseAllDocuments, + RequestAboutGraphiteDialog, NewDocument, OpenDocument, OpenDocumentFile(String, String), @@ -124,6 +125,9 @@ impl MessageHandler for DocumentsMessageHa use DocumentMessage::*; use DocumentsMessage::*; match message { + RequestAboutGraphiteDialog => { + responses.push_back(FrontendMessage::DisplayAboutGraphiteDialog.into()); + } Document(message) => self.active_document_mut().process_action(message, ipp, responses), SelectDocument(index) => { // NOTE: Potentially this will break if we ever exceed 56 bit values due to how the message parsing system works. diff --git a/editor/src/frontend/frontend_message_handler.rs b/editor/src/frontend/frontend_message_handler.rs index f8a6d281..4bb0fd1e 100644 --- a/editor/src/frontend/frontend_message_handler.rs +++ b/editor/src/frontend/frontend_message_handler.rs @@ -15,6 +15,7 @@ pub enum FrontendMessage { DisplayPanic { panic_info: String, title: String, description: String }, DisplayConfirmationToCloseDocument { document_index: usize }, DisplayConfirmationToCloseAllDocuments, + DisplayAboutGraphiteDialog, UpdateLayer { data: LayerPanelEntry }, UpdateCanvas { document: String }, UpdateScrollbars { position: (f64, f64), size: (f64, f64), multiplier: (f64, f64) }, @@ -22,8 +23,6 @@ pub enum FrontendMessage { ExportDocument { document: String, name: String }, SaveDocument { document: String, name: String }, OpenDocumentBrowse, - EnableTextInput, - DisableTextInput, UpdateWorkingColors { primary: Color, secondary: Color }, SetCanvasZoom { new_zoom: f64 }, SetCanvasRotation { new_radians: f64 }, diff --git a/frontend/src/components/widgets/floating-menus/DialogModal.vue b/frontend/src/components/widgets/floating-menus/DialogModal.vue index 88969029..a5bf0242 100644 --- a/frontend/src/components/widgets/floating-menus/DialogModal.vue +++ b/frontend/src/components/widgets/floating-menus/DialogModal.vue @@ -9,7 +9,7 @@ {{ dialog.heading }} {{ dialog.details }} - + @@ -57,12 +57,14 @@ .main-column { .heading { + user-select: text; white-space: pre-wrap; max-width: 400px; margin-bottom: 4px; } .details { + user-select: text; white-space: pre-wrap; max-width: 400px; } diff --git a/frontend/src/components/widgets/inputs/MenuBarInput.vue b/frontend/src/components/widgets/inputs/MenuBarInput.vue index 6e3eeae3..a5d46e20 100644 --- a/frontend/src/components/widgets/inputs/MenuBarInput.vue +++ b/frontend/src/components/widgets/inputs/MenuBarInput.vue @@ -153,14 +153,11 @@ const menuEntries: MenuListEntries = [ label: "Help", ref: undefined, children: [ + [{ label: "About Graphite", action: async () => (await wasm).request_about_graphite_dialog() }], [ { label: "Report a Bug", action: () => window.open("https://github.com/GraphiteEditor/Graphite/issues/new", "_blank") }, { label: "Visit on GitHub", action: () => window.open("https://github.com/GraphiteEditor/Graphite", "_blank") }, ], - [ - { label: "Graphite License", action: () => window.open("https://raw.githubusercontent.com/GraphiteEditor/Graphite/master/LICENSE.txt", "_blank") }, - { label: "Third-Party Licenses", action: () => window.open("/third-party-licenses.txt", "_blank") }, - ], [{ label: "Debug: Panic (DANGER)", action: async () => (await wasm).intentional_panic() }], ], }, diff --git a/frontend/src/components/workspace/Workspace.vue b/frontend/src/components/workspace/Workspace.vue index a137dc36..285ef465 100644 --- a/frontend/src/components/workspace/Workspace.vue +++ b/frontend/src/components/workspace/Workspace.vue @@ -55,6 +55,8 @@