From 868d2e88aaf056b3f80303706a24b84542b839c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Neves?= Date: Mon, 26 Nov 2018 20:40:55 -0500 Subject: [PATCH] refactor: remove not necessary tray configuration and code cleanup --- config/electron.js | 48 +++++----------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/config/electron.js b/config/electron.js index fb6a115..ec550fa 100644 --- a/config/electron.js +++ b/config/electron.js @@ -2,22 +2,14 @@ import path from 'path'; /* eslint-disable import/no-extraneous-dependencies */ -import { - app, BrowserWindow, powerMonitor, Tray, -} from 'electron'; +import { app, BrowserWindow } from 'electron'; import { autoUpdater } from 'electron-updater'; -import Positioner from 'electron-positioner'; import isDev from 'electron-is-dev'; /* eslint-enable import/no-extraneous-dependencies */ - -import type { - BrowserWindow as BrowserWindowType, - Tray as TrayType, -} from 'electron'; +import type { BrowserWindow as BrowserWindowType } from 'electron'; import { registerDebugShortcut } from '../utils/debug-shortcut'; let mainWindow: BrowserWindowType; -let tray: TrayType; let updateAvailable: boolean = false; const showStatus = (text) => { @@ -61,43 +53,13 @@ const createWindow = () => { }); mainWindow.setVisibleOnAllWorkspaces(true); - - // TODO: Update to right icon location - tray = new Tray(path.join(__dirname, '../public/images', 'zcash-icon.png')); - registerDebugShortcut(app, mainWindow); - tray.setToolTip('ZCash'); - mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../build/index.html')}`); - - const positioner = new Positioner(mainWindow); - let bounds = tray.getBounds(); - positioner.move('trayCenter', bounds); - - powerMonitor.on('suspend', () => mainWindow.webContents.send('suspend', 'suspended')); - powerMonitor.on('resume', () => mainWindow.webContents.send('resume', 'resumed')); - - mainWindow.once('ready-to-show', () => mainWindow.show()); - mainWindow.on('blur', () => mainWindow.hide()); - mainWindow.on('show', () => tray.setHighlightMode('always')); - mainWindow.on('hide', () => tray.setHighlightMode('never')); - mainWindow.on('closed', () => { - mainWindow = null; - }); - - tray.on('click', () => { - bounds = tray.getBounds(); - positioner.move('trayCenter', bounds); - - if (mainWindow.isVisible()) { - mainWindow.hide(); - } else { - mainWindow.show(); - } - }); + mainWindow.loadURL(isDev + ? 'http://0.0.0.0:8080/' + : `file://${path.join(__dirname, '../build/index.html')}`); exports.app = app; - exports.tray = tray; }; app.on('ready', createWindow);