From e2eb051c3143910dc97870602eff312ffd8efdc1 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Thu, 6 Jun 2019 14:43:25 +0100
Subject: [PATCH] Control custom title bar using store value

---
 app/app.js      | 54 +++++++++++++++++++++++++++++++++----------------
 app/menu.js     | 14 ++++++++++++-
 app/store.js    |  9 +++++++++
 src/main.app.js |  9 ++++++---
 4 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 app/store.js

diff --git a/app/app.js b/app/app.js
index 066ae2d2..34c5c85a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,6 +6,9 @@ const autoUpdater = updater.autoUpdater;
 const contextMenu = require('electron-context-menu')
 const path = require('path')
 
+// Attach settings store
+const { store } = require('./store')
+
 // Auto upadater 
 autoUpdater.autoDownload = false;
 
@@ -14,9 +17,7 @@ autoUpdater.setFeedURL({
     url: "https://gitlab.com/openflexure/openflexure-microscope-jsclient/-/jobs/artifacts/stable/raw?job=package"
 });
 
-autoUpdater.on('checking-for-update', function () {
-    sendStatusToWindow('Checking for update...');
-});
+autoUpdater.on('checking-for-update', function () {});
 
 autoUpdater.on('update-available', function (info) {
   sendStatusToWindow('Update available.' + info)
@@ -76,51 +77,70 @@ let mainWindow
 // Set the application menu
 require('./menu.js')
 
+// Handle redrawing the mainWindow
+let recreatingWindowInProgress = false;
+
+function toggleCustomTitleBar () {
+  // Mark window as being recreated, to prevent stopping the application
+  recreatingWindowInProgress = true
+
+  // Invert the drawCustomTitleBar setting
+  store.set('drawCustomTitleBar', !store.get('drawCustomTitleBar'))
+
+  // Destroy old window
+  mainWindow.destroy()
+  // Create new window
+  createWindow()
+
+  // Mark window as no longer being recreated
+  recreatingWindowInProgress = false
+}
+
 function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
-    frame: (process.platform !== 'darwin') ? false : true,
+    frame: !store.get('drawCustomTitleBar'),
     width: 1124, 
     height: 800,
     icon: path.join(__dirname, '/icons/png/64x64.png')
   })
 
+  // Make a context menu
   contextMenu({
     showCopyImageAddress: true,
     showSaveImageAs: true,
     showInspectElement: false,
   });
 
+  // Load window contents
   mainWindow.loadURL(url)
+
+  // Check for updates
   autoUpdater.checkForUpdates();
 
   // Emitted when the window is closed.
   mainWindow.on('closed', function() {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
+    mainWindow = null  // Dereference the window object
   })
 }
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', () => {
+  createWindow()
+})
 
 // Quit when all windows are closed.
 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 (process.platform !== 'darwin') {
+  if ((process.platform !== 'darwin') && recreatingWindowInProgress != true) {
     app.quit()
   }
 })
 
 app.on('activate', function() {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
   if (mainWindow === null) {
     createWindow()
   }
-})
\ No newline at end of file
+})
+
+// Export toggleCustomTitleBar for use in ./menu.js
+module.exports.toggleCustomTitleBar = toggleCustomTitleBar
\ No newline at end of file
diff --git a/app/menu.js b/app/menu.js
index 950e8f42..bcfe4fed 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -5,6 +5,9 @@ const path = require('path')
 
 const openAboutWindow = require('about-window').default
 
+const main = require('./app')
+const { store } = require('./store')
+
 const template = [
   {
     label: 'Edit',
@@ -26,7 +29,16 @@ const template = [
       { role: 'forcereload' },
       { role: 'toggledevtools' },
       { type: 'separator' },
-      { role: 'togglefullscreen' }
+      { role: 'togglefullscreen' },
+      { type: 'separator' },
+      {
+        type: 'checkbox',
+        checked: store.get('drawCustomTitleBar'),
+        label: 'Custom titlebar',
+        click () {
+          main.toggleCustomTitleBar()
+        }
+      }
     ]
   },
   {
diff --git a/app/store.js b/app/store.js
new file mode 100644
index 00000000..bd1a8b95
--- /dev/null
+++ b/app/store.js
@@ -0,0 +1,9 @@
+const Store = require('electron-store');
+const store = new Store();
+
+if (store.has('drawCustomTitleBar') !== true) {
+  // Default to false if on MacOS, otherwise true
+  store.set('drawCustomTitleBar', (process.platform !== 'darwin') ? true : false)
+}
+
+module.exports.store = store
\ No newline at end of file
diff --git a/src/main.app.js b/src/main.app.js
index b1b606db..27d2b187 100644
--- a/src/main.app.js
+++ b/src/main.app.js
@@ -1,8 +1,11 @@
-import { Titlebar, Color } from 'custom-electron-titlebar'
+// Load settings store from main process
+const { store } = require('electron').remote.require('./store')
 
+// Load extra modules we'll be using
+const { Titlebar, Color } = require('custom-electron-titlebar');
 
-// Only show custom menubar for Windows or Linux
-if ((process.platform !== 'darwin')) {
+// Only show custom menubar if current window has no frame
+if (store.get('drawCustomTitleBar') == true) {
     new Titlebar({
         backgroundColor: Color.fromHex('#c5247f'),
         icon: './titleicon.svg'