Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-27 09:36:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(tray): "Open Inbox" if main window is minimized / hidden

Browse source
This commit is contained in:
Ben Gotow 2015-11-13 18:11:44 -08:00
parent 53bca8e2f5
commit 27ae261d1b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal_packages/system-tray/lib/tray-store.es6
View file

@ -1,8 +1,8 @@
import path from 'path';
import remote from 'remote';
import ipc from 'ipc';
import NylasStore from 'nylas-store';
import {UnreadCountStore, CanvasUtils} from 'nylas-exports';
const WindowManager = remote.getGlobal('application').windowManager;
const NativeImage = remote.require('native-image');
const Menu = remote.require('menu');
const {canvasWithSystemTrayIconAndText} = CanvasUtils;
@ -15,25 +15,25 @@ const UNREAD_ICON_PATH = path.join(__dirname, '..', 'assets', process.platform,
const menuTemplate = [
{
label: 'New Message',
click: ()=> WindowManager.sendToMainWindow('new-message'),
click: ()=> ipc.send('command', 'application:new-message')
},
{
label: 'Preferences',
click: ()=> WindowManager.sendToMainWindow('open-preferences'),
click: ()=> ipc.send('command', 'application:open-preferences')
},
{
type: 'separator',
},
{
label: 'Quit N1',
click: ()=> atom.quit(),
click: ()=> ipc.send('command', 'application:quit')
},
];
if (process.platform === 'darwin') {
menuTemplate.unshift({
label: 'Open inbox',
click: ()=> atom.focus(),
label: 'Open Inbox',
click: ()=> ipc.send('command', 'application:show-main-window')
});
}

2
src/browser/window-manager.coffee
View file

@ -62,6 +62,8 @@ class WindowManager
@_mainWindow.focus()
else if !@_mainWindow.isVisible()
@_mainWindow.showWhenLoaded()
else
@_mainWindow.focus()
else
if @devMode