@@ -6,7 +6,7 @@ import { initThumbar } from "@main/services/thumbar";
66import { enableTaskbarThumbnail } from "@main/services/thumbnail" ;
77import { initTray } from "@main/services/tray" ;
88import { store } from "@main/store" ;
9- import { handleCacheProtocolOnPartition , MAIN_PARTITION } from "@main/utils/protocol" ;
9+ import { MAIN_PARTITION } from "@main/utils/protocol" ;
1010import { isAppQuitting } from "@main/utils/lifecycle" ;
1111import { broadcast } from "@main/utils/broadcast" ;
1212import { CURRENT_AGREEMENT_VERSION } from "@shared/constants/agreement" ;
@@ -32,8 +32,6 @@ export const createMainWindow = (): BrowserWindow => {
3232 /** 旧版窗口状态 */
3333 const legacyState = remember ? store . get ( "windowStates.main" ) : undefined ;
3434
35- // 注册 cache:// 协议
36- handleCacheProtocolOnPartition ( MAIN_PARTITION ) ;
3735 const borderlessWindow = store . get ( "system.borderlessWindow" ) ?? true ;
3836
3937 mainWindow = createWindow ( {
@@ -86,7 +84,7 @@ export const createMainWindow = (): BrowserWindow => {
8684 mainWindow . on ( "close" , ( event ) => {
8785 if ( isAppQuitting ( ) ) return ;
8886 event . preventDefault ( ) ;
89- mainWindow ?. hide ( ) ;
87+ hideMainWindow ( ) ;
9088 } ) ;
9189 // 最大化
9290 mainWindow . on ( "maximize" , ( ) => {
@@ -217,9 +215,16 @@ export const toggleFullscreenMainWindow = (): void => {
217215/** 查询是否全屏 */
218216export const isMainWindowFullscreen = ( ) : boolean => ! ! getMainWindow ( ) ?. isFullScreen ( ) ;
219217
220- /** 隐藏主窗口 */
218+ /** 隐藏主窗口,macOS 全屏空间退出后再隐藏以避免残留黑屏 */
221219export const hideMainWindow = ( ) : void => {
222- getMainWindow ( ) ?. hide ( ) ;
220+ const win = getMainWindow ( ) ;
221+ if ( ! win ) return ;
222+ if ( process . platform === "darwin" && win . isFullScreen ( ) ) {
223+ win . once ( "leave-full-screen" , ( ) => win . hide ( ) ) ;
224+ win . setFullScreen ( false ) ;
225+ return ;
226+ }
227+ win . hide ( ) ;
223228} ;
224229
225230/** 应用界面缩放:百分比 → setZoomFactor(clamp 0.5~2.0) */
0 commit comments