github/EasytierGame
4
0
Fork 0
mirror of https://github.com/EasyTier/EasytierGame.git synced 2025-05-19 10:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

不再兼容原autostart库-移除autostart库

Browse Source 
将开机自启检测使用plugins-cli进行判断
修复创建窗口后多次触发监听的情况
This commit is contained in:
黑先森
2024-12-03 16:08:59 +08:00
parent 5d11f39855
commit e8b82007c2
8 changed files with 177 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composables/windows.ts
+12 -6
View File
@@ -2,17 +2,20 @@ import { type UnlistenFn } from "@tauri-apps/api/event";
import { getCurrentWindow, PhysicalPosition, type WindowOptions, Window, currentMonitor } from "@tauri-apps/api/window";
import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
import type { WebviewLabel, WebviewOptions } from "@tauri-apps/api/webview";
const _listenersMaps: { [key: string]: [UnlistenFn | null, UnlistenFn | null] } = {};
export default async (
label: WebviewLabel,
options?: Omit<WebviewOptions, "x" | "y" | "width" | "height"> & WindowOptions,
afterCreatedFunc?: (webviewWindow: WebviewWindow, appWindow: Window) => void | null,
beforeCloseFunc?: () => void | null
) => {
let unListenlogClose: UnlistenFn | null = null;
let unlistenLogCreated: UnlistenFn | null = null;
const unlistenFnList: [UnlistenFn | null, UnlistenFn | null] = _listenersMaps[label] || [null, null];
let [unlistenLogCreated, unListenlogClose] = unlistenFnList;
let dialog = await WebviewWindow.getByLabel(label);
if (!dialog) {
let defaultOpts: {[key:string]: any, parent: Window | undefined} = {
let defaultOpts: { [key: string]: any; parent: Window | undefined } = {
parent: undefined,
closable: true,
resizable: true,
@@ -25,17 +28,16 @@ export default async (
const appWindow = getCurrentWindow();
if (appWindow) {
const appSize = await appWindow.outerSize();
// const monitor = await currentMonitor();
// console.error(monitor)
const factor = await appWindow.scaleFactor();
const appPosition = await appWindow.outerPosition();
// console.error((appPosition.x + appSize.width) / 1.25);
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
defaultOpts.parent = appWindow;
// console.error(logicalPosition);
defaultOpts.x = logicalPosition.x;
defaultOpts.y = logicalPosition.y;
}
unlistenLogCreated && (await (unlistenLogCreated as Function)());
unListenlogClose && (await unListenlogClose());
dialog = new WebviewWindow(label, { ...defaultOpts, ...options });
unlistenLogCreated = await dialog.listen("tauri://webview-created", async () => {
if (dialog) {
@@ -43,10 +45,14 @@ export default async (
await dialog.show();
}
});
unlistenFnList[0] = unlistenLogCreated;
unListenlogClose = await dialog.onCloseRequested(async () => {
beforeCloseFunc && (await beforeCloseFunc());
unListenlogClose && (await unListenlogClose());
unlistenLogCreated && (await (unlistenLogCreated as Function)());
});
unlistenFnList[1] = unlistenLogCreated;
_listenersMaps[label] = unlistenFnList;
} else {
const visible = await dialog.isVisible();
if (visible) {