From e896f19f1a85973731515df0cbb45162cce04631 Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Mon, 18 Mar 2024 06:52:40 +0000 Subject: [PATCH] fix(electron): disable mica for windows for now (#6165) Upstream https://github.com/electron/electron/issues/41073 --- packages/frontend/core/src/commands/affine-settings.tsx | 2 +- .../frontend/core/src/components/affine/app-container.tsx | 4 +++- .../setting-modal/general-setting/appearance/index.tsx | 4 ++-- .../frontend/core/src/components/root-app-sidebar/index.tsx | 6 +++++- packages/frontend/electron/src/main/main-window.ts | 5 ++++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/frontend/core/src/commands/affine-settings.tsx b/packages/frontend/core/src/commands/affine-settings.tsx index 2891ad5955..17c827355a 100644 --- a/packages/frontend/core/src/commands/affine-settings.tsx +++ b/packages/frontend/core/src/commands/affine-settings.tsx @@ -252,7 +252,7 @@ export function registerAffineSettingsCommands({ ]()}`, category: 'affine:settings', icon: , - preconditionStrategy: () => environment.isDesktop, + preconditionStrategy: () => environment.isDesktop && environment.isMacOs, run() { store.set(appSettingAtom, prev => ({ ...prev, diff --git a/packages/frontend/core/src/components/affine/app-container.tsx b/packages/frontend/core/src/components/affine/app-container.tsx index 563c753545..d680931ad9 100644 --- a/packages/frontend/core/src/components/affine/app-container.tsx +++ b/packages/frontend/core/src/components/affine/app-container.tsx @@ -11,7 +11,9 @@ export const AppContainer = (props: WorkspaceRootProps) => { diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx index bfafc6e725..5988c8e15b 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx @@ -211,7 +211,7 @@ export const AppearanceSettings = () => { } /> - { + {environment.isMacOs && ( { } /> - } + )} ) : null} diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx index d4a5b8a3d4..a230cbc011 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx @@ -169,7 +169,11 @@ export const RootAppSidebar = ({ return ( { uiSubjects.onMaximized.next(true); + browserWindow.setBackgroundMaterial('none'); }); // full-screen == maximized in UI on windows browserWindow.on('enter-full-screen', () => { uiSubjects.onMaximized.next(true); + browserWindow.setBackgroundMaterial('none'); }); browserWindow.on('unmaximize', () => { uiSubjects.onMaximized.next(false); + browserWindow.setBackgroundMaterial('none'); }); /**