Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-01 01:30:51 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

revert: remove backgroundMaterial for win

Browse Source
This commit is contained in:
Teo 2025-06-14 18:44:35 +08:00
parent 20b3db0c01
commit 7d70425c75
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/services/WindowService.ts
View File

@ -60,10 +60,9 @@ export class WindowService {
transparent: false, transparent: false,
vibrancy: 'sidebar', vibrancy: 'sidebar',
visualEffectState: 'active', visualEffectState: 'active',
backgroundMaterial: isWin ? 'acrylic' : undefined,
titleBarStyle: 'hidden', titleBarStyle: 'hidden',
titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight, titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight,
backgroundColor: undefined, backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF',
darkTheme: nativeTheme.shouldUseDarkColors, darkTheme: nativeTheme.shouldUseDarkColors,
trafficLightPosition: { x: 12, y: 12 }, trafficLightPosition: { x: 12, y: 12 },
...(isLinux ? { icon } : {}), ...(isLinux ? { icon } : {}),

7
src/renderer/src/hooks/useAppInit.ts
View File

@ -1,4 +1,3 @@
import { isMac } from '@renderer/config/constant'
import { isLocalAi } from '@renderer/config/env' import { isLocalAi } from '@renderer/config/env'
import { useTheme } from '@renderer/context/ThemeProvider' import { useTheme } from '@renderer/context/ThemeProvider'
import db from '@renderer/databases' import db from '@renderer/databases'
@ -68,11 +67,7 @@ export function useAppInit() {
return return
} }
window.root.style.background = !minappShow window.root.style.background = !minappShow ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
? isMac
? 'var(--navbar-background-mac)'
: 'var(--navbar-background-win)'
: 'var(--color-background)'
}, [minappShow, theme]) }, [minappShow, theme])
useEffect(() => { useEffect(() => {

16
src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
View File

@ -1,7 +1,7 @@
import { SyncOutlined } from '@ant-design/icons' import { SyncOutlined } from '@ant-design/icons'
import CodeEditor from '@renderer/components/CodeEditor' import CodeEditor from '@renderer/components/CodeEditor'
import { HStack } from '@renderer/components/Layout' 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 { useTheme } from '@renderer/context/ThemeProvider'
import { useSettings } from '@renderer/hooks/useSettings' import { useSettings } from '@renderer/hooks/useSettings'
import useUserTheme from '@renderer/hooks/useUserTheme' import useUserTheme from '@renderer/hooks/useUserTheme'
@ -199,11 +199,15 @@ const DisplaySettings: FC = () => {
/> />
</HStack> </HStack>
</SettingRow> </SettingRow>
<SettingDivider /> {!isMac && (
<SettingRow> <>
<SettingRowTitle>{t('settings.theme.window.style.transparent')}</SettingRowTitle> <SettingDivider />
<Switch checked={transparentWindow} onChange={setTransparentWindow} /> <SettingRow>
</SettingRow> <SettingRowTitle>{t('settings.theme.window.style.transparent')}</SettingRowTitle>
<Switch checked={transparentWindow} onChange={setTransparentWindow} />
</SettingRow>
</>
)}
</SettingGroup> </SettingGroup>
<SettingGroup theme={theme}> <SettingGroup theme={theme}>
<SettingTitle>{t('settings.display.zoom.title')}</SettingTitle> <SettingTitle>{t('settings.display.zoom.title')}</SettingTitle>