diff --git a/src/main/index.ts b/src/main/index.ts index bc55c8b92c..74a0b4a963 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -3,7 +3,7 @@ import "../common/system-ca" import "../common/prometheus-providers" import { app, dialog } from "electron" -import { appName, appProto, isMac, staticDir, staticProto } from "../common/vars"; +import { appName, appProto, staticDir, staticProto } from "../common/vars"; import path from "path" import initMenu from "./menu" import { LensProxy } from "./lens-proxy" @@ -78,28 +78,8 @@ async function main() { windowManager.showSplash(); } -// Events app.on("ready", main); -// fixme: never happens, Cmd+W doesn't work -app.on('window-all-closed', function () { - // On OS X it is common for applications and their menu bar - // to stay active until the user quits explicitly with Cmd + Q - if (!isMac) { - app.quit(); - } else { - // todo: handle - // windowManager.destroy(); - // clusterManager.stop() - } -}) - -app.on("activate", () => { - // todo: handle - logger.debug("app:activate"); -}) - - app.on("will-quit", async (event) => { event.preventDefault(); // To allow mixpanel sending to be executed if (clusterManager) clusterManager.stop() diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss index e8340f2853..3bd651540b 100755 --- a/src/renderer/components/app.scss +++ b/src/renderer/components/app.scss @@ -14,6 +14,7 @@ --mainBackground: #1e2124; --textColorPrimary: #87909c; --clusters-menu-bgc: #252729; + --main-layout-header: 40px; } ::selection { @@ -42,14 +43,15 @@ html, body { } } -// fixme: doesn't work #draggable-top { @include set-draggable; position: absolute; left: 0; top: 0; width: 100%; - height: 20px; + height: var(--main-layout-header); + z-index: 1000; + pointer-events: none; } body { diff --git a/src/renderer/components/layout/main-layout.scss b/src/renderer/components/layout/main-layout.scss index 36c2234dc8..9174852643 100755 --- a/src/renderer/components/layout/main-layout.scss +++ b/src/renderer/components/layout/main-layout.scss @@ -1,6 +1,5 @@ .MainLayout { - --main-layout-header: 40px; --sidebar-max-size: 200px; display: grid;