mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-22 14:11:42 +00:00
Merge branch 'dev'
* dev: alert fix debug missing argument bump version rollback: setVisibleOnAllWorkspaces(true) FinderのActivity logをちゃんと取ってくる FinderのInputにLato fontが使われていない問題修正 Search inputにRegExp operatorが入ると使えなかった問題改善 User name change and modify style Conflicts: package.json
This commit is contained in:
9
main.js
9
main.js
@@ -128,9 +128,10 @@ app.on('ready', function () {
|
||||
console.log('FINDER(stdout): ' + payload.data)
|
||||
break
|
||||
case 'show-main-window':
|
||||
if (mainWindow != null) {
|
||||
mainWindow.show()
|
||||
}
|
||||
mainWindow.show()
|
||||
break
|
||||
case 'copy-finder':
|
||||
mainWindow.webContents.send('copy-finder')
|
||||
break
|
||||
case 'request-data':
|
||||
mainWindow.webContents.send('request-data')
|
||||
@@ -173,6 +174,7 @@ app.on('ready', function () {
|
||||
try {
|
||||
globalShortcut.register(toggleFinderKey, function () {
|
||||
emitToFinder('open-finder')
|
||||
mainWindow.webContents.send('open-finder', {})
|
||||
})
|
||||
} catch (err) {
|
||||
console.log(err.name)
|
||||
@@ -189,6 +191,7 @@ app.on('ready', function () {
|
||||
try {
|
||||
globalShortcut.register(toggleFinderKey, function () {
|
||||
emitToFinder('open-finder')
|
||||
mainWindow.webContents.send('open-finder', {})
|
||||
})
|
||||
mainWindow.webContents.send('APP_SETTING_DONE', {})
|
||||
} catch (err) {
|
||||
|
||||
Reference in New Issue
Block a user