From 61602afcf91951c2bbe7b1f6863f8623e73a1425 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 29 Nov 2020 22:42:16 +0900
Subject: [PATCH] refactor: Use invoke for ipc to change global header
---
src/main/index.ts | 20 +++++++-------------
src/renderer/store/GlobalHeader.ts | 12 ++++--------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/main/index.ts b/src/main/index.ts
index 0ec87d42..9025d499 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -940,20 +940,14 @@ ipcMain.handle('get-collapse', async (_: IpcMainInvokeEvent) => {
return conf.state.collapse
})
-ipcMain.on('change-global-header', (event: IpcMainEvent, value: boolean) => {
+ipcMain.handle('change-global-header', async (_: IpcMainInvokeEvent, value: boolean) => {
const preferences = new Preferences(preferencesDBPath)
- preferences
- .update({
- state: {
- hideGlobalHeader: value
- }
- })
- .then(conf => {
- event.sender.send('response-change-global-header', conf)
- })
- .catch(err => {
- log.error(err)
- })
+ const conf = await preferences.update({
+ state: {
+ hideGlobalHeader: value
+ }
+ })
+ return conf
})
ipcMain.on('get-global-header', (event: IpcMainEvent) => {
diff --git a/src/renderer/store/GlobalHeader.ts b/src/renderer/store/GlobalHeader.ts
index 0d72d04b..e3039e9e 100644
--- a/src/renderer/store/GlobalHeader.ts
+++ b/src/renderer/store/GlobalHeader.ts
@@ -104,14 +104,10 @@ const actions: ActionTree = {
})
})
},
- switchHide: ({ dispatch }, hide: boolean): Promise => {
- return new Promise(resolve => {
- win.ipcRenderer.send('change-global-header', hide)
- win.ipcRenderer.once('response-change-global-header', () => {
- dispatch('loadHide')
- resolve(true)
- })
- })
+ switchHide: async ({ dispatch }, hide: boolean): Promise => {
+ await win.ipcRenderer.invoke('change-global-header', hide)
+ dispatch('loadHide')
+ return true
},
startUserStreamings: ({ state }): Promise<{}> => {
// @ts-ignore