Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2025-01-07 18:58:37 +01:00
Code Issues Projects Releases Wiki Activity

proper icons for macos

Browse Source
This commit is contained in:
Kyle Spearrin 2018-05-04 13:32:30 -04:00
parent db0986e95f
commit 70606f208b
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/images/icon-highlight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

BIN
src/images/icon-highlight@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 B

BIN
src/images/icon-template.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

BIN
src/images/icon-template@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 B

17
src/main/tray.main.ts
View File

@ -1,4 +1,7 @@
import { Tray } from 'electron';
import {
NativeImage,
Tray,
} from 'electron';
import * as path from 'path';
import { WindowMain } from 'jslib/electron/window.main';
@ -7,13 +10,17 @@ import { DesktopConstants } from '../desktopConstants';
export class TrayMain {
private tray: Tray;
private iconPath: string;
private icon: string | NativeImage;
constructor(private windowMain: WindowMain, private appName: string, private minToTray: () => Promise<boolean>) {
if (process.platform === 'win32') {
this.iconPath = path.join(__dirname, '/images/icon.ico');
this.icon = path.join(__dirname, '/images/icon.ico');
} else if (process.platform === 'darwin') {
const nativeImage = NativeImage.createFromPath(path.join(__dirname, '/images/icon-template.png'));
nativeImage.setTemplateImage(true);
this.icon = nativeImage;
} else {
this.iconPath = path.join(__dirname, '/images/icon.png');
this.icon = path.join(__dirname, '/images/icon.png');
}
}
@ -38,7 +45,7 @@ export class TrayMain {
}
private handleHideEvent() {
this.tray = new Tray(this.iconPath);
this.tray = new Tray(this.icon);
this.tray.setToolTip(this.appName);
this.tray.on('click', () => {