refactor: Use invoke for ipc to list fonts

This commit is contained in:
AkiraFukushima 2020-11-29 23:22:33 +09:00
parent 0cb08601f8
commit ad94355eda
2 changed files with 7 additions and 21 deletions

View File

@ -1006,14 +1006,9 @@ ipcMain.handle('remove-hashtag', async (_: IpcMainInvokeEvent, tag: LocalTag) =>
})
// Fonts
ipcMain.on('list-fonts', (event: IpcMainEvent) => {
Fonts()
.then(list => {
event.sender.send('response-list-fonts', list)
})
.catch(err => {
event.sender.send('error-list-fonts', err)
})
ipcMain.handle('list-fonts', async (_: IpcMainInvokeEvent) => {
const list = await Fonts()
return list
})
// Unread notifications

View File

@ -49,19 +49,10 @@ const actions: ActionTree<AppearanceState, RootState> = {
commit(MUTATION_TYPES.UPDATE_APPEARANCE, conf.appearance)
return conf
},
loadFonts: ({ commit }) => {
return new Promise((resolve, reject) => {
win.ipcRenderer.once('error-list-fonts', (_, err: Error) => {
win.ipcRenderer.removeAllListeners('response-list-fonts')
reject(err)
})
win.ipcRenderer.once('response-list-fonts', (_, fonts: Array<string>) => {
win.ipcRenderer.removeAllListeners('error-list-fonts')
commit(MUTATION_TYPES.UPDATE_FONTS, [DefaultFonts[0]].concat(fonts))
resolve(fonts)
})
win.ipcRenderer.send('list-fonts')
})
loadFonts: async ({ commit }) => {
const fonts: Array<string> = await win.ipcRenderer.invoke('list-fonts')
commit(MUTATION_TYPES.UPDATE_FONTS, [DefaultFonts[0]].concat(fonts))
return fonts
},
updateTheme: async ({ dispatch, commit, state }, themeKey: string) => {
const newAppearance: Appearance = Object.assign({}, state.appearance, {