Little changes

src-tauri/Cargo.toml

@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.2", features = [ "window-all", "fs-all", "dialog-all"] }
+tauri = { version = "1.5.2", features = [ "shell-all", "window-all", "fs-all", "dialog-all"] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/tauri.conf.json

@@ -21,6 +21,9 @@
 	  },
 	  "window": {
 		"all": true
+	  },
+	  "shell": {
+		"all": true
 	  }
     },
     "bundle": {

src/lib/editor.ts

@@ -3,6 +3,7 @@ import { initVimMode } from "monaco-vim";
 import { onClose, onOpen, onSave, onCreate, startAutosave, initDropFileListener } from "./file";
 import { Store } from "./store";
 import { addMarkdownActions } from "./languages/markdown";
+import { open } from "@tauri-apps/api/shell";
 import { addVimActions } from "./vim";
 import { createNotice } from "./status";
 
@@ -32,7 +33,7 @@ export function initEditor(editorWrapper: HTMLElement, store: Store) {
 		minimap: {
 			autohide: true,
 		},
-		fontFamily: "Fira Code",
+		fontFamily: "'Fira Code', sans-serif",
 		fontLigatures: true,
 		padding: {
 			top: 32,
@@ -159,7 +160,7 @@ function addActions(editor: monaco.editor.IStandaloneCodeEditor, store: Store) {
 		id: "marker.open_repo",
 		label: "Show Marker on GitHub",
 		run: () => {
-			window.open("https://github.com/notangelmario/marker", "_blank", "noopener noreferrer")
+			open("https://github.com/notangelmario/marker")
 		},
 		contextMenuGroupId: "9_marker"
 	});

src/lib/languages/markdown.ts

@@ -3,7 +3,7 @@ import { createNotice } from "../status";
 import monaco from "../monaco";
 import { writeTextFile } from "@tauri-apps/api/fs";
 import { save as saveFile } from "@tauri-apps/api/dialog";
-import { WebviewWindow } from "@tauri-apps/api/window";
+import { appWindow, WebviewWindow } from "@tauri-apps/api/window";
 
 export function addMarkdownActions(editor: monaco.editor.IStandaloneCodeEditor) {
 	editor.addAction({
@@ -48,9 +48,14 @@ export function startPreviewWatcher(editor: monaco.editor.IStandaloneCodeEditor,
 	const dispose = editor.getModel()?.onDidChangeContent(() => {
 		previewWindow.emit("load-content", editor.getValue());
 	})
+
+	appWindow.onCloseRequested(() => {
+		stopPreviewWatcher(previewWindow);
+		dispose?.dispose();
+	})
 
 	previewWindow.onCloseRequested(() => {
-		stopPreviewWatcher(previewWindow),
+		stopPreviewWatcher(previewWindow);
 		dispose?.dispose();
 	})
 }