lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Support always-one-top and disabled-web-shortcuts

Browse Source
This commit is contained in:
Tw93
2024-05-09 15:31:19 +08:00
parent 5f678ebd10
commit 7bcaeb6d7e
5 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/helpers/merge.ts vendored
View File

@@ -14,6 +14,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
fullscreen,
transparent,
alwaysOnTop,
disabledWebShortcuts,
userAgent,
showSystemTray,
systemTrayIcon,
@@ -34,6 +35,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
fullscreen,
transparent,
alwaysOnTop,
disabledWebShortcuts,
resizable,
};
Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
@@ -193,7 +195,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
logger.error('The injected file must be in either CSS or JS format.');
return;
}
const files = inject.map(filepath => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
const files = inject.map(filepath => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
tauriConf.pake.inject = files;
await combineFiles(files, injectFilePath);
} else {