diff --git a/src/main/funcs/events.ts b/src/main/funcs/events.ts index 145e0af..9c483e1 100644 --- a/src/main/funcs/events.ts +++ b/src/main/funcs/events.ts @@ -1,7 +1,7 @@ // レンダラープロセスからのメッセージを受信する import { createOptionWindow, createWindow, taskbars, windowPosition } from './windows' import { activateWindow, grantPermission, macWindowProcesses } from './helper' -import { ipcMain, screen } from 'electron' +import { app, ipcMain, screen } from 'electron' import { Options, store } from './store' export function setEventHandlers() { @@ -41,6 +41,8 @@ export function setEventHandlers() { }) ipcMain.on('clearSetting', () => { store.clear() + app.relaunch() + app.quit() }) screen.on('display-added', (_, newDisplay) => { createWindow(newDisplay) diff --git a/src/main/funcs/windows.ts b/src/main/funcs/windows.ts index ac3e98b..9c3bd94 100644 --- a/src/main/funcs/windows.ts +++ b/src/main/funcs/windows.ts @@ -32,7 +32,7 @@ export function createWindow(display: Display) { alwaysOnTop: true, skipTaskbar: true, show: false, - ...windowPosition(display, store.get('options').layout as LayoutType) + ...windowPosition(display, store.store.options.layout as LayoutType) }) // 準備ができたら表示 @@ -87,8 +87,6 @@ export function windowPosition( display: Electron.Display, type: LayoutType ): { width: number; height: number; x: number; y: number } { - // なんかこの返り値だいぶ怪しそう - return { // 右のときは 画面右端から - 210ピクセル x: type === 'right' ? display.workArea.x + display.workArea.width - 210 : display.workArea.x, diff --git a/src/renderer/src/pages/option.vue b/src/renderer/src/pages/option.vue index a72e6b1..55acba5 100644 --- a/src/renderer/src/pages/option.vue +++ b/src/renderer/src/pages/option.vue @@ -46,7 +46,7 @@
- +