Merge pull request #68 from Sandural/master

fix tray display in mac

package.json

@@ -16,7 +16,7 @@
     "postinstall": "electron-builder install-app-deps",
     "rebuild": "npm rebuild --runtime=electron --target=3.0.0 --disturl=https://atom.io/download/atom-shell --abi=64",
     "prebuild": "tsc ./src/prebuild.ts && node ./src/prebuild.js && npm run clean",
-    "clean": "del src\\*.js /s",
+    "clean": "rm -f src\\*.js /s",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs",
     "docs:deploy": "sh docs/.vuepress/release/sync.sh deploy"

src/tools/envConfig.ts

@@ -3,6 +3,7 @@ const path = require("path");
 const fs = require("fs");
 
 const iconName = os.type() == "Windows_NT" ? "icon.ico" : "icon.png";
+const trayIconName = 'icon@2x.png';
 
 function mkdir(path: string) {
   if (fs.existsSync(path)) {
@@ -23,6 +24,7 @@ interface SharedConfig {
 interface DiffConfig {
   systemLocaleDir: string;
   iconPath: string;
+  trayIconPath:string;
   styleTemplate: string;
 }
 
@@ -42,12 +44,14 @@ const sharedConfig: SharedConfig = {
 const ProductionConfig: DiffConfig = {
   systemLocaleDir: path.join(process.resourcesPath, "locales"),
   iconPath: path.join(process.resourcesPath, iconName),
+  trayIconPath: path.join(process.resourcesPath, trayIconName),
   styleTemplate: path.join(process.resourcesPath, "styles.css")
 };
 
 const DevConfig: DiffConfig = {
   systemLocaleDir: path.join(process.cwd(), "dist_locales"),
   iconPath: path.join(process.cwd(), iconName),
+  trayIconPath: path.join(process.cwd(), trayIconName),
   styleTemplate: path.join(process.cwd(), "src", "styles.css")
 };
 

src/tools/tray.ts

@@ -6,7 +6,7 @@ class TrayManager {
   tray: Tray | undefined;
   constructor() {}
   init() {
-    this.tray = new Tray(envConfig.diffConfig.iconPath);
+    this.tray = new Tray(envConfig.diffConfig.trayIconPath);
     this.tray.setToolTip(constants.appName);
     this.tray.on("right-click", event => {
       (<any>global).controller.action.popup("Tray");

src/tools/windows.ts

@@ -195,7 +195,9 @@ class WindowWrapper {
       y: param.y,
       width: param.width,
       height: param.height,
-      frame: false
+      minWidth: 800,
+      minHeight: 600,
+      // frame: false
     });
     this.load(routeName);
     this.window.on("closed", () => {

vue.config.js

@@ -1,6 +1,8 @@
 const iconName =
   require("os").type() === "Windows_NT" ? "icon.ico" : "icon.png";
 
+const trayIconName = require('os').platform() === 'darwin' ? 'icon@2x.png' : "icon.png"
+
 module.exports = {
   pluginOptions: {
     electronBuilder: {
@@ -12,6 +14,10 @@ module.exports = {
             from: `dist_locales`,
             to: `locales`
           },
+          {
+            from: trayIconName,
+            to: trayIconName
+          },
           {
             from: iconName,
             to: iconName