1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

fix focusing bug

This commit is contained in:
Dick Choi
2016-08-14 02:20:57 +09:00
parent b07fb92e5c
commit e30cfdf942
2 changed files with 18 additions and 7 deletions

View File

@@ -15,11 +15,12 @@ const { remote } = electron
const { Menu } = remote
function hideFinder () {
if (process.platform === 'win32') {
remote.getCurrentWindow().minimize()
return
let finderWindow = remote.getCurrentWindow()
if (global.process.platform === 'win32') {
finderWindow.blur()
finderWindow.hide()
}
if (process.platform === 'darwin') {
if (global.process.platform === 'darwin') {
Menu.sendActionToFirstResponder('hide:')
}
remote.getCurrentWindow().hide()
@@ -48,6 +49,7 @@ class FinderMain extends React.Component {
}
componentDidMount () {
this.refs.search.focus()
window.addEventListener('focus', this.focusHandler)
window.addEventListener('blur', this.blurHandler)
}

View File

@@ -30,12 +30,21 @@ function toggleFinder () {
finderWindow.show()
}
} else {
if (!finderWindow.isMinimized()) {
finderWindow.minimize()
if (finderWindow.isVisible()) {
finderWindow.blur()
finderWindow.hide()
} else {
nodeIpc.of.node.emit('request-data')
finderWindow.restore()
finderWindow.show()
finderWindow.focus()
}
// if (!finderWindow.isMinimized()) {
// finderWindow.minimize()
// } else {
// nodeIpc.of.node.emit('request-data')
// finderWindow.restore()
// finderWindow.focus()
// }
}
}