♻️ Some CSS cleanup and fixes for 16/10 ratio+touch

Author: GitSquared

src/_boot.js

@@ -1,8 +1,9 @@
 const signale = require("signale");
-const {app, BrowserWindow} = require("electron");
+const {app, BrowserWindow, dialog} = require("electron");
 
 process.on("uncaughtException", e => {
     signale.fatal(e);
+    dialog.showErrorBox("eEDEX-UI failed to launch", e.message || "Cannot retrieve error message.");
     if (tty) {
         tty.tty.kill();
     }
@@ -118,11 +119,10 @@ app.on('ready', () => {
         height,
         show: false,
         resizable: true,
-        movable: false,
+        movable: settings.allowWindowed || false,
         fullscreen: true,
-        skipTaskbar: true,
         autoHideMenuBar: true,
-        frame: false,
+        frame: settings.allowWindowed || false,
         backgroundColor: '#000000',
         webPreferences: {
             devTools: true,
@@ -142,7 +142,9 @@ app.on('ready', () => {
     win.once("ready-to-show", () => {
         signale.complete("Frontend window is up!");
         win.show();
-        win.setResizable(false);
+        if (!settings.allowWindowed) {
+            win.setResizable(false);
+        }
     });
 
     signale.watch("Waiting for frontend connection...");

src/_renderer.js

@@ -327,8 +327,11 @@ window.themeChanger = (theme) => {
 };
 
 // Prevent showing menu, exiting fullscreen or app with keyboard shortcuts
-window.onkeydown = (e) => {
-    if (e.key === "Alt" || e.key === "F11") {
+window.onkeydown = e => {
+    if (e.key === "Alt") {
+        e.preventDefault();
+    }
+    if (e.key === "F11" && !settings.allowWindowed) {
         e.preventDefault();
     }
     if (e.code === "KeyD" && e.ctrlKey) {
@@ -339,16 +342,5 @@ window.onkeydown = (e) => {
     }
 };
 
-// Initiate graphical error display
-window.edexErrorsModals = [];
-window.onerror = (msg, path, line, col, error) => {
-    let errorModal = new Modal({
-        type: "error",
-        title: error,
-        message: `${msg}<br/>        at ${path}  ${line}:${col}`
-    });
-    window.edexErrorsModals.push(errorModal);
-
-    ipc.send("log", "error", `${error}: ${msg}`);
-    ipc.send("log", "debug", `at ${path} ${line}:${col}`);
-};
+// Fix double-tap zoom on touchscreens
+require('electron').webFrame.setVisualZoomLevelLimits(1, 1);

src/assets/css/keyboard.css

@@ -47,12 +47,12 @@ section#keyboard.animation_state_2 > * {
 
 div.keyboard_row:last-child {
     position: relative;
-    left: 2.98vh;
+    left: 2.4vh;
 }
 
 div.keyboard_key {
-    height: 4.9vh;
-    min-width: 4.9vh;
+    height: 2.7vw;
+    min-width: 2.7vw;
     overflow: hidden;
     border-radius: 0.46vh;
     background-color: rgba(var(--color_r), var(--color_g), var(--color_b), 0.0);
@@ -150,7 +150,7 @@ div.keyboard_row#row_2 > div.keyboard_enter {
     margin-top: 0vh;
     height: 6.389vh;
     top: -0.37vh;
-    right: -0.9vh;
+    right: -1vh;
 }
 
 div.keyboard_row#row_2 > div.keyboard_enter:active, div.keyboard_row#row_2 > div.keyboard_enter.active {
@@ -221,3 +221,15 @@ section#keyboard[data-is-fn-on="true"] > div.keyboard_row > div.keyboard_key > h
     position: absolute;
     opacity: 0;
 }
+
+/* Support for other screen ratios than 16:9 */
+@media (aspect-ratio: 16/10) {
+    div.keyboard_row:last-child {
+        left: 1.1vh;
+    }
+
+    div.keyboard_row#row_2 > div.keyboard_enter {
+        top: -0.7vh;
+        right: -0.9vh;
+    }
+}

src/classes/terminal.class.js

@@ -122,6 +122,19 @@ class Terminal {
                 this._lastTouch = null;
             });
 
+            document.querySelector(".xterm-helper-textarea").addEventListener("keydown", e => {
+                if (e.key === "F11" && window.settings.allowWindowed) {
+                    e.preventDefault();
+                    let win = require("electron").remote.BrowserWindow.getFocusedWindow();
+                    let bool = (win.isFullScreen() ? false : true);
+                    win.setFullScreen(bool);
+
+                    setTimeout(() => {
+                        this.fit();
+                    }, 700);
+                }
+            });
+
             this.fit = () => {
                 this.term.fit();
                 setTimeout(() => {