self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic
2018-02-28 17:27:06 +00:00
parent 058285e0b9 e75c62bf0f
commit 8cf0e4517a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ElectronClient/app/ElectronAppWrapper.js
View File

@@ -79,7 +79,7 @@ class ElectronAppWrapper {
this.win_ = null; this.win_ = null;
} else { } else {
event.preventDefault(); event.preventDefault();
this.win_.hide(); this.hide();
} }
} else { } else {
if (this.trayShown() && !this.willQuitApp_) { if (this.trayShown() && !this.willQuitApp_) {
@@ -118,6 +118,12 @@ class ElectronAppWrapper {
return !!this.tray_; return !!this.tray_;
} }
// This method is used in macOS only to hide the whole app (and not just the main window)
// including the menu bar. This follows the macOS way of hidding an app.
hide() {
this.electronApp_.hide();
}
buildDir() { buildDir() {
if (this.buildDir_) return this.buildDir_; if (this.buildDir_) return this.buildDir_;
let dir = __dirname + '/build'; let dir = __dirname + '/build';

2
ElectronClient/app/app.js
View File

@@ -365,7 +365,7 @@ class Application extends BaseApplication {
label: _('Hide %s', 'Joplin'), label: _('Hide %s', 'Joplin'),
platforms: ['darwin'], platforms: ['darwin'],
accelerator: 'CommandOrControl+H', accelerator: 'CommandOrControl+H',
click: () => { bridge().window().hide() } click: () => { bridge().electronApp().hide() }
}, { }, {
type: 'separator', type: 'separator',
}, { }, {