diff --git a/index.js b/index.js index 93d64a7..a1a2b8a 100644 --- a/index.js +++ b/index.js @@ -14,6 +14,7 @@ const fs = require("fs"); const AdmZip = require("adm-zip"); const PluginManager = require("./plugins") const {autoUpdater} = require("electron-updater"); +const os = require("os"); let mainWindow; @@ -539,6 +540,10 @@ function isAppBundled(){ } function installUpdates(){ + if (os.platform() !== "win32"){ + openLinkInBrowser(null, "https://github.com/atticuscornett/mimacro/releases/latest"); + return; + } autoUpdater.checkForUpdates(); autoUpdater.on("update-downloaded", () => { autoUpdater.quitAndInstall(); diff --git a/package.json b/package.json index a28b920..2a7abad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mimacro", - "version": "0.9.0", + "version": "1.0.0", "description": "The ultimate microcontroller macro solution", "main": "index.js", "scripts": { diff --git a/public/firmware/arduino/uno/build/arduino.avr.uno/uno.ino.elf b/public/firmware/arduino/uno/build/arduino.avr.uno/uno.ino.elf index 8cd8557..bd7c1bf 100644 Binary files a/public/firmware/arduino/uno/build/arduino.avr.uno/uno.ino.elf and b/public/firmware/arduino/uno/build/arduino.avr.uno/uno.ino.elf differ diff --git a/src/Components/FloatingPopup.svelte b/src/Components/FloatingPopup.svelte index 5af0981..c693e09 100644 --- a/src/Components/FloatingPopup.svelte +++ b/src/Components/FloatingPopup.svelte @@ -38,8 +38,8 @@ if ((Number(x) + popup.offsetWidth) > window.innerWidth){ modX -= popup.offsetWidth; } - if (Number(modX) + popup.offsetWidth > window.innerWidth){ - modX = window.innerWidth - 10 - popup.offsetWidth; + if (Number(modX) + popup.offsetWidth > document.body.clientWidth){ + modX = document.body.clientWidth - 10 - popup.offsetWidth; } if ((Number(y) + popup.offsetHeight) > (window.innerHeight + window.scrollY)){ modY -= popup.offsetHeight; @@ -54,7 +54,7 @@ $: { if (show){ placePopup(); - setTimeout(() => {document.addEventListener("click", clickListener);}, 10); + setTimeout(() => {placePopup(); document.addEventListener("click", clickListener);}, 50); } else{ document.removeEventListener("click", clickListener);