From 93271cd2498d73e9dc35e572d8c31ae9645b7d8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 12 七月 2024 11:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/background.js | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/background.js b/src/background.js
index 5d81b89..823bb8d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,5 +1,4 @@
-// src-electron/main.js
-const { app, BrowserWindow } = require('electron');
+const { app, BrowserWindow, screen, globalShortcut, ipcMain } = require('electron');
const { join } = require('path');
// 灞忚斀瀹夊叏璀﹀憡
@@ -7,13 +6,18 @@
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
// 鍒涘缓娴忚鍣ㄧ獥鍙ｆ椂锛岃皟鐢ㄨ繖涓嚱鏁般��
-const createWindow = () => {
+const createWindow = (width, height) => {
const win = new BrowserWindow({
- width: 800,
- height: 600,
+ width: width,
+ height: height,
+ minWidth: 1280,
+ minHeight: 720,
+ webPreferences: {
+ preload: join(__dirname, 'preload.js')
+ }
});
- // win.loadURL('http://localhost:3000')
+ win.maximize();
// development妯″紡
if (process.env.VITE_DEV_SERVER_URL) {
win.loadURL(process.env.VITE_DEV_SERVER_URL);
@@ -26,12 +30,43 @@
// Electron 浼氬湪鍒濆鍖栧悗骞跺噯澶�
app.whenReady().then(() => {
- createWindow();
+ const { width, height } = screen.getPrimaryDisplay().bounds;
+ createWindow(width, height);
app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) createWindow();
+ });
+
+ // 鐩戝惉鎵撳紑鏂扮獥鍙�
+ ipcMain.on('open-new-window', (event, meet) => {
+ const { meetName, id } = JSON.parse(meet);
+ const childWin = new BrowserWindow({
+ width: width,
+ height: height,
+ minWidth: width,
+ minHeight: height,
+ webPreferences: {
+ preload: join(__dirname, 'preload.js')
+ }
+ });
+ childWin.maximize();
+ // development妯″紡
+ if (process.env.VITE_DEV_SERVER_URL) {
+ childWin.loadURL(process.env.VITE_DEV_SERVER_URL + '#/meet?' + `meetName=${meetName}&id=${id}`);
+ } else {
+ childWin.loadFile(join(__dirname, '../dist/index.html'), {
+ hash: '/meet',
+ query: {
+ meetName,
+ id
+ }
+ });
+ }
});
});
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') app.quit();
});
+
+
+
--
Gitblit v1.8.0