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

fix(icon): Use app icon on win32, use correct path on Linux

Browse source
This commit is contained in:
Ben Gotow 2016-01-05 11:25:36 -08:00
parent 9f8791762d
commit cb226d2a6f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/browser/nylas-window.coffee
View file

@ -5,11 +5,12 @@ url = require 'url'
_ = require 'underscore' _ = require 'underscore'
{EventEmitter} = require 'events' {EventEmitter} = require 'events'
WindowIconPath = null
module.exports = module.exports =
class NylasWindow class NylasWindow
_.extend @prototype, EventEmitter.prototype _.extend @prototype, EventEmitter.prototype
@iconPath: path.resolve(__dirname, '..', '..', 'build', 'resources', 'nylas.png')
@includeShellLoadTime: true @includeShellLoadTime: true
browserWindow: null browserWindow: null
@ -58,7 +59,6 @@ class NylasWindow
width: width width: width
height: height height: height
resizable: resizable ? true resizable: resizable ? true
icon: @constructor.iconPath
webPreferences: webPreferences:
directWrite: true directWrite: true
@ -70,7 +70,11 @@ class NylasWindow
# Don't set icon on Windows so the exe's ico will be used as window and # Don't set icon on Windows so the exe's ico will be used as window and
# taskbar's icon. See https://github.com/atom/atom/issues/4811 for more. # taskbar's icon. See https://github.com/atom/atom/issues/4811 for more.
if process.platform is 'linux' if process.platform is 'linux'
options.icon = @constructor.iconPath unless WindowIconPath
WindowIconPath = path.resolve(__dirname, '..', '..', 'nylas.png')
unless fs.existsSync(WindowIconPath)
WindowIconPath = path.resolve(__dirname, '..', '..', 'build', 'resources', 'nylas.png')
options.icon = WindowIconPath
@browserWindow = new BrowserWindow(options) @browserWindow = new BrowserWindow(options)
global.application.windowManager.addWindow(this) global.application.windowManager.addWindow(this)