rooty/Mstdn
1
0
Fork 0
mirror of https://github.com/rhysd/Mstdn.git synced 2025-04-05 22:57:36 +02:00
Code Issues Releases Activity

manage focus on toggling window on Windows

Browse Source
This commit is contained in:
rhysd 2017-04-25 14:58:37 +09:00
parent 840ecde8ef
commit 282b24d7b0
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/app.ts
View File

@ -36,20 +36,7 @@ export class App {
return; return;
} }
if (this.win.menubar) { globalShortcut.register(this.config.hot_key, () => this.win.toggle());
globalShortcut.register(this.config.hot_key, () => {
const mb = this.win.menubar!;
if (mb.window.isFocused()) {
log.debug('Toggle window: shown -> hidden');
mb.hideWindow();
} else {
log.debug('Toggle window: hidden -> shown');
mb.showWindow();
}
});
} else {
globalShortcut.register(this.config.hot_key, this.toggleNormalWindow);
}
log.debug('Hot key was set to:', this.config.hot_key); log.debug('Hot key was set to:', this.config.hot_key);
} }
@ -62,28 +49,14 @@ export class App {
const icon = trayIcon(this.config.icon_color); const icon = trayIcon(this.config.icon_color);
const tray = new Tray(icon); const tray = new Tray(icon);
tray.on('click', this.toggleNormalWindow); const toggle = this.win.toggle.bind(this.win);
tray.on('double-click', this.toggleNormalWindow); tray.on('click', toggle);
tray.on('double-click', toggle);
if (IS_DARWIN) { if (IS_DARWIN) {
tray.setHighlightMode('never'); tray.setHighlightMode('never');
} }
} }
private toggleNormalWindow = () => {
const win = this.win.browser;
if (win.isFocused()) {
log.debug('Toggle window: shown -> hidden');
if (IS_DARWIN) {
app.hide();
} else {
win.hide();
}
} else {
log.debug('Toggle window: hidden -> shown');
win.show();
}
}
private onAccountSwitch = (next: Account) => { private onAccountSwitch = (next: Account) => {
this.win.close(); this.win.close();
Window.create(next, this.config, this.win.menubar).then(win => { Window.create(next, this.config, this.win.menubar).then(win => {

30
main/window.ts
View File

@ -106,6 +106,36 @@ export default class Window {
} }
this.browser.close(); this.browser.close();
} }
toggle() {
if (this.menubar) {
if (this.browser.isFocused()) {
log.debug('Toggle window: shown -> hidden');
this.menubar.hideWindow();
} else {
log.debug('Toggle window: hidden -> shown');
this.menubar.showWindow();
}
} else {
if (this.browser.isFocused()) {
log.debug('Toggle window: shown -> hidden');
if (IS_DARWIN) {
app.hide();
} else {
if (IS_WINDOWS) {
this.browser.blur();
}
this.browser.hide();
}
} else {
log.debug('Toggle window: hidden -> shown');
this.browser.show();
if (IS_WINDOWS) {
this.browser.focus();
}
}
}
}
} }
function applyUserCss(win: Electron.BrowserWindow, config: Config) { function applyUserCss(win: Electron.BrowserWindow, config: Config) {