🖥️ wip: attempts to make frameless window draggable

KiritoKing · Apr 15, 2023 · c3c40c6 · c3c40c6
1 parent 3b7de5e
commit c3c40c6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/Handlers/SaveConfig.ts b/src/main/Handlers/SaveConfig.ts
@@ -2,11 +2,13 @@ import { writeFileSync } from 'fs';
 import path from 'path';
 import { getConfig } from '../util';
 import { IConfig, ipcHanlder } from '../typing';
+import { setWindowTitle } from '../main';
 
 // SendMessage: 入参要求：arg[0]=IConfig对象
 const saveConfigHandler: ipcHanlder = (_event, args) => {
   if (!(args && args[0])) return; // 参数不正确
   const newConfig = args[0] as IConfig;
+  if (newConfig?.title) setWindowTitle(newConfig.title);
   const oldConfig = getConfig();
   const configPath = path.join(oldConfig.workFolder, 'config.json');
   writeFileSync(configPath, JSON.stringify(newConfig));

diff --git a/src/main/main.ts b/src/main/main.ts
@@ -3,7 +3,7 @@
 
 import path from 'path';
 import { app, BrowserWindow, ipcMain, Menu } from 'electron';
-import { resolveHtmlPath } from './util';
+import { getConfig, resolveHtmlPath } from './util';
 import importFileHandler from './Handlers/ImportFile';
 import openFolderHandler from './Handlers/OpenFolder';
 import saveResultHandler from './Handlers/SaveResultHandler';
@@ -61,6 +61,7 @@ const createWindow = async () => {
         ? path.join(__dirname, 'preload.js')
         : path.join(__dirname, '../../.erb/dll/preload.js'),
     },
+    // frame: isDebug,
   });
 
   mainWindow.loadURL(resolveHtmlPath('index.html'));
@@ -74,6 +75,8 @@ const createWindow = async () => {
     } else {
       mainWindow.show();
     }
+    const title = getConfig()?.title;
+    if (title) mainWindow.title = title;
   });
 
   mainWindow.on('closed', () => {
@@ -121,3 +124,10 @@ app
     }
   })
   .catch(console.log);
+
+// eslint-disable-next-line import/prefer-default-export
+export const setWindowTitle = (title: string) => {
+  if (mainWindow) {
+    mainWindow.setTitle(title);
+  }
+};
diff --git a/src/renderer/Components/HeadBar/styles.module.scss b/src/renderer/Components/HeadBar/styles.module.scss
@@ -2,5 +2,10 @@
   user-select: none;
   -webkit-user-select: none;
   max-height: 60px;
-  // -webkit-app-region: drag;
+  -webkit-app-region: drag !important;
 }
+
+// .titleBar button,
+// .titleBar a {
+//   -webkit-app-region: no-drag;
+// }