diff --git a/app/app.js b/app/app.js
index 48316176..066ae2d2 100644
--- a/app/app.js
+++ b/app/app.js
@@ -79,6 +79,7 @@ require('./menu.js')
function createWindow() {
// Create the browser window.
mainWindow = new BrowserWindow({
+ frame: (process.platform !== 'darwin') ? false : true,
width: 1124,
height: 800,
icon: path.join(__dirname, '/icons/png/64x64.png')
diff --git a/package-lock.json b/package-lock.json
index ded0d3f8..5a00b113 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "openflexure-ev",
- "version": "0.2.5",
+ "version": "0.2.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -3643,6 +3643,11 @@
"array-find-index": "^1.0.1"
}
},
+ "custom-electron-titlebar": {
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.0.8.tgz",
+ "integrity": "sha512-VFyV3y5DVcVhGXx1yo16gwNFusbivGQUGTf7ANBA2Hho2tsWvxoVc03rJ908qWqy/yPA0++qSw7AJqjaHimwRA=="
+ },
"cyclist": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
diff --git a/package.json b/package.json
index f1feb62f..c0ba0e17 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,13 @@
"dist:appx": "electron-builder --win --config app/builder-config-appx.yaml",
"build:web": "vue-cli-service build --mode production.web",
"build:app": "vue-cli-service build --mode production.app",
- "electron:run": "electron .",
+ "electron:run": "npm run build:app && electron app/app.js",
"electron:dev": "electron app/app.dev.js",
- "serve": "vue-cli-service serve"
+ "serve:web": "vue-cli-service serve"
},
"dependencies": {
"about-window": "^1.12.1",
+ "custom-electron-titlebar": "^3.0.8",
"electron-context-menu": "^0.11.0",
"electron-updater": "^4.0.6"
},
diff --git a/public/titleicon.svg b/public/titleicon.svg
new file mode 100644
index 00000000..f88a3088
--- /dev/null
+++ b/public/titleicon.svg
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
deleted file mode 100644
index f3d2503f..00000000
Binary files a/src/assets/images/logo.png and /dev/null differ
diff --git a/src/assets/less/app.less b/src/assets/less/app.less
new file mode 100644
index 00000000..008ee44f
--- /dev/null
+++ b/src/assets/less/app.less
@@ -0,0 +1,17 @@
+// Theming specific to the electron app
+
+.menubar-menu-container {
+ box-shadow: 0.5px 1px 4px 0px rgba(0,0,0,0.3) !important;
+}
+
+.menubar-menu-container > * {
+ box-shadow: none !important;
+}
+
+.menubar-menu-container .action-menu-item, .menubar-menu-container .action-label {
+ cursor: default
+}
+
+.menubar-menu-container a:hover {
+ text-decoration: none;
+}
\ No newline at end of file
diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index 96eae129..26ed2ebd 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -4,6 +4,9 @@
// Highlight.js
@import "./highlight.less";
+// Electron app theming
+@import "./app.less";
+
// Custom OpenFlexure theming
@global-primary-background: #C32280;
diff --git a/src/components/panelDisplay.vue b/src/components/panelDisplay.vue
index 66b705af..f07c2efe 100644
--- a/src/components/panelDisplay.vue
+++ b/src/components/panelDisplay.vue
@@ -1,8 +1,8 @@