Skip to content

Commit

Permalink
fix 1x tray display & click tray has no effect when the window has al…
Browse files Browse the repository at this point in the history
…ready show
  • Loading branch information
miaowing committed Jul 30, 2020
1 parent 11c5970 commit 066a8e0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dolphin",
"productName": "Dolphin",
"version": "0.1.0",
"version": "0.1.1",
"description": "An electron ssh dynamic port forward client for MacOS",
"repository": {
"url": "https://github.com/miaowing/dolphin"
Expand Down
Binary file modified src/assets/trayTemplate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ if (require('electron-squirrel-startup')) { // eslint-disable-line global-requir
app.quit();
}

app.dock.hide();

let willQuit = false;
// @ts-ignore
let tray;
Expand Down Expand Up @@ -133,6 +131,7 @@ process.on('uncaughtException', e => {
});

app.on('before-quit', () => willQuit = true);
// app.dock.hide();

// In this file you can include the rest of your app's specific main process
// code. You can also put them in separate files and import them here.
3 changes: 2 additions & 1 deletion src/tray.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export const initTray = (window: BrowserWindow) => {
e.preventDefault();
window.show();
} else {
window.moveTop();
window.setAlwaysOnTop(true);
window.setAlwaysOnTop(false);
}
});

Expand Down

0 comments on commit 066a8e0

Please sign in to comment.