fix(electron): disable mica for windows for now (#6165)

Upstream electron/electron#41073
toeverything · Mar 18, 2024 · e896f19 · e896f19
1 parent 386bd03
commit e896f19
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git 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: <SettingsIcon />,
-      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
@@ -11,7 +11,9 @@ export const AppContainer = (props: WorkspaceRootProps) => {
     <AppContainerWithoutSettings
       useNoisyBackground={appSettings.enableNoisyBackground}
       useBlurBackground={
-        appSettings.enableBlurBackground && environment.isDesktop
+        appSettings.enableBlurBackground &&
+        environment.isDesktop &&
+        environment.isMacOs
       }
       {...props}
     />

diff --git a/...es/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx b/...es/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx
@@ -211,7 +211,7 @@ export const AppearanceSettings = () => {
               }
             />
           </SettingRow>
-          {
+          {environment.isMacOs && (
             <SettingRow
               name={t['com.affine.appearanceSettings.translucentUI.title']()}
               desc={t[
@@ -225,7 +225,7 @@ export const AppearanceSettings = () => {
                 }
               />
             </SettingRow>
-          }
+          )}
         </SettingWrapper>
       ) : 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
@@ -169,7 +169,11 @@ export const RootAppSidebar = ({
   return (
     <AppSidebar
       hasBackground={
-        !(appSettings.enableBlurBackground && environment.isDesktop)
+        !(
+          appSettings.enableBlurBackground &&
+          environment.isDesktop &&
+          environment.isMacOs
+        )
       }
     >
       <MoveToTrash.ConfirmModal

diff --git a/packages/frontend/electron/src/main/main-window.ts b/packages/frontend/electron/src/main/main-window.ts
@@ -54,7 +54,7 @@ async function createWindow(additionalArguments: string[]) {
     minHeight: 480,
     visualEffectState: 'active',
     vibrancy: 'under-window',
-    backgroundMaterial: 'mica',
+    // backgroundMaterial: 'mica',
     height: mainWindowState.height,
     show: false, // Use 'ready-to-show' event to show window
     webPreferences: {
@@ -117,15 +117,18 @@ async function createWindow(additionalArguments: string[]) {
 
   browserWindow.on('maximize', () => {
     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');
   });
 
   /**