Merge pull request #95 from mellobacon/master

Merge master into release

README.md

@@ -14,7 +14,7 @@
   </h3>
 <p align="center">
   <a href="https://github.com/mellobacon/Nucleus/blob/d704ed7892344480fb6fcd3c94ef534f52cadc31/LICENSE">License</a> •
-  Download
+  <a href="https://github.com/mellobacon/Nucleus/releases">Download</a>
 </p>
 
 ___

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nucleus"
-version = "0.2.0"
+version = "0.2.1"
 description = "A Tauri App"
 authors = ["mellobacon"]
 license = ""

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "nucleus",
-    "version": "0.2.0"
+    "version": "0.2.1"
   },
   "tauri": {
     "allowlist": {

src/config/commands.ts

@@ -142,6 +142,26 @@ export const commands = {
             //
         }
     },
+    "minimizeWindow": {
+        "keybind": "",
+        "command": () => {
+            appWindow.minimize()
+        }
+    },
+    "maximizeWindow": {
+        "keybind": "",
+        "command": async () => {
+            if (await appWindow.isFullscreen()) {
+                return;
+            }
+            if (await appWindow.isMaximized()) {
+                appWindow.unmaximize();
+            }
+            else {
+                appWindow.maximize()
+            }
+        }
+    },
     "closeWindow": {
         "keybind": "Alt+F4",
         "command": async () => {

src/lib/Editor.svelte

@@ -82,6 +82,7 @@
         })
         editorView.contentDOM.classList.add("mousetrap");
         setEditorFontSize(await appSettings.get("editor.fontSize"));
+        setEditorFontFamily(await appSettings.get("editor.fontFamily"));
     });
 
     let _ = null;

src/lib/Header.svelte

@@ -42,8 +42,8 @@
         ]},
         {menuname: "Window", children: [
             {name: "New Window", disabled: true,  shortcut: commands.openNewWindow.keybind, action: commands.openNewWindow.command},
-            {name: "Minimize Window", shortcut: "", action: async () => {await appWindow.minimize()}},
-            {name: "Maximize Window", shortcut: "", action: async () => {await appWindow.maximize()}},
+            {name: "Minimize Window", shortcut: commands.minimizeWindow.keybind, action: commands.minimizeWindow.command},
+            {name: "Maximize Window", shortcut: commands.maximizeWindow.keybind, action: commands.maximizeWindow.command},
             {name: "Close Window", shortcut: commands.closeWindow.keybind, action: commands.closeWindow.command},
         ]},
         {menuname: "Help", children: [
@@ -56,50 +56,55 @@
             {name: "About", disabled: true,  shortcut: "", action: () => {console.warn("Feature not implemented yet.")}},
         ]},
     ];
+
+    const x = appWindow.isFullscreen()
 </script>
-<div id="header">
-    <div id="logo"></div>
-    <div id="menubar">
-        {#each items as item}
-            <Dropdown menu={item}></Dropdown>
-        {/each}
-    </div>
-    <div class="divider"></div>
-    <div id="workspace" title="" data-tauri-drag-region>
-        {$workspaceName}
-    </div>
-    <div id="handle" data-tauri-drag-region></div>
-    <div class="tools">
-
-        <div class="settings-button">
-            <Dropdown right menu={{icon: Settings, children: [
-                {name: "Settings", shortcut: "", action: () => {addTab("Settings", "Settings", new settings({target: document.getElementById("tabview")}))}}, 
-                {name: "Keymap", disabled: true, shortcut: "", action: () => {console.warn("Feature not implemented yet.")}}
-            ]
-            }} />
+
+{#if x}
+    <div id="header">
+        <div id="logo"></div>
+        <div id="menubar">
+            {#each items as item}
+                <Dropdown menu={item}></Dropdown>
+            {/each}
+        </div>
+        <div class="divider"></div>
+        <div id="workspace" title="" data-tauri-drag-region>
+            {$workspaceName}
+        </div>
+        <div id="handle" data-tauri-drag-region></div>
+        <div class="tools">
+
+            <div class="settings-button">
+                <Dropdown right menu={{icon: Settings, children: [
+                    {name: "Settings", shortcut: "", action: () => {addTab("Settings", "Settings", new settings({target: document.getElementById("tabview")}))}}, 
+                    {name: "Keymap", disabled: true, shortcut: "", action: () => {console.warn("Feature not implemented yet.")}}
+                ]
+                }} />
+            </div>
+        </div>
+        <div id="window-controls">
+            <!-- svelte-ignore a11y-click-events-have-key-events -->
+            <div
+                class="window-button"
+                id="minimize"
+                on:click={commands.minimizeWindow.command}
+            />
+            <!-- svelte-ignore a11y-click-events-have-key-events -->
+            <div
+                class="window-button"
+                id="maximize"
+                on:click={commands.maximizeWindow.command}
+            />
+            <!-- svelte-ignore a11y-click-events-have-key-events -->
+            <div
+                class="window-button"
+                id="close"
+                on:click={commands.closeWindow.command}
+            />
         </div>
     </div>
-    <div id="window-controls">
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <div
-            class="window-button"
-            id="minimize"
-            on:click={() => appWindow.minimize()}
-        />
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <div
-            class="window-button"
-            id="maximize"
-            on:click={async () => { (await appWindow.isMaximized()) ? appWindow.unmaximize() : appWindow.maximize(); }}
-        />
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <div
-            class="window-button"
-            id="close"
-            on:click={commands.closeWindow.command}
-        />
-    </div>
-</div>
+{/if}
 
 <style lang="scss">
     #header {