From 7d70425c75cd4b6d79481013fda5fcee8d2f3fdf Mon Sep 17 00:00:00 2001 From: Teo Date: Sat, 14 Jun 2025 18:44:35 +0800 Subject: [PATCH] revert: remove backgroundMaterial for win --- src/main/services/WindowService.ts | 3 +-- src/renderer/src/hooks/useAppInit.ts | 7 +------ .../settings/DisplaySettings/DisplaySettings.tsx | 16 ++++++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts index c271e54bd0..3153f7bffe 100644 --- a/src/main/services/WindowService.ts +++ b/src/main/services/WindowService.ts @@ -60,10 +60,9 @@ export class WindowService { transparent: false, vibrancy: 'sidebar', visualEffectState: 'active', - backgroundMaterial: isWin ? 'acrylic' : undefined, titleBarStyle: 'hidden', titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight, - backgroundColor: undefined, + backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF', darkTheme: nativeTheme.shouldUseDarkColors, trafficLightPosition: { x: 12, y: 12 }, ...(isLinux ? { icon } : {}), diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts index 3eea2e73c6..d068197f91 100644 --- a/src/renderer/src/hooks/useAppInit.ts +++ b/src/renderer/src/hooks/useAppInit.ts @@ -1,4 +1,3 @@ -import { isMac } from '@renderer/config/constant' import { isLocalAi } from '@renderer/config/env' import { useTheme } from '@renderer/context/ThemeProvider' import db from '@renderer/databases' @@ -68,11 +67,7 @@ export function useAppInit() { return } - window.root.style.background = !minappShow - ? isMac - ? 'var(--navbar-background-mac)' - : 'var(--navbar-background-win)' - : 'var(--color-background)' + window.root.style.background = !minappShow ? 'var(--navbar-background-mac)' : 'var(--navbar-background)' }, [minappShow, theme]) useEffect(() => { diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx index ae57225b77..8bd4d1a6dd 100644 --- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx +++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx @@ -1,7 +1,7 @@ import { SyncOutlined } from '@ant-design/icons' import CodeEditor from '@renderer/components/CodeEditor' import { HStack } from '@renderer/components/Layout' -import { THEME_COLOR_PRESETS } from '@renderer/config/constant' +import { isMac, THEME_COLOR_PRESETS } from '@renderer/config/constant' import { useTheme } from '@renderer/context/ThemeProvider' import { useSettings } from '@renderer/hooks/useSettings' import useUserTheme from '@renderer/hooks/useUserTheme' @@ -199,11 +199,15 @@ const DisplaySettings: FC = () => { /> - - - {t('settings.theme.window.style.transparent')} - - + {!isMac && ( + <> + + + {t('settings.theme.window.style.transparent')} + + + + )} {t('settings.display.zoom.title')}