whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: 黑暗模式的启动页是白色的 #118

Browse Source 
close #118
This commit is contained in:
kangfenmao 2024-10-12 13:33:42 +08:00
parent ff5de3625e
commit 9baf0f772e
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/window.ts
View File

@ -16,6 +16,8 @@ export function createMainWindow() {
const theme = appConfig.get('theme') || 'light' const theme = appConfig.get('theme') || 'light'
// Create the browser window. // Create the browser window.
const isMac = process.platform === 'darwin'
const mainWindow = new BrowserWindow({ const mainWindow = new BrowserWindow({
x: mainWindowState.x, x: mainWindowState.x,
y: mainWindowState.y, y: mainWindowState.y,
@ -25,11 +27,12 @@ export function createMainWindow() {
minHeight: 600, minHeight: 600,
show: true, show: true,
autoHideMenuBar: true, autoHideMenuBar: true,
transparent: process.platform === 'darwin', transparent: isMac,
vibrancy: 'fullscreen-ui', vibrancy: 'fullscreen-ui',
visualEffectState: 'active', visualEffectState: 'active',
titleBarStyle: 'hidden', titleBarStyle: 'hidden',
titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight, titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
trafficLightPosition: { x: 8, y: 12 }, trafficLightPosition: { x: 8, y: 12 },
...(process.platform === 'linux' ? { icon } : {}), ...(process.platform === 'linux' ? { icon } : {}),
webPreferences: { webPreferences: {

20
src/renderer/index.html
View File

@ -1,16 +1,17 @@
<!doctype html> <!doctype html>
<html lang="zh-CN"> <html lang="zh-CN">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1, width=device-width" /> <meta name="viewport" content="initial-scale=1, width=device-width" />
<meta <meta http-equiv="Content-Security-Policy"
http-equiv="Content-Security-Policy"
content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: *; frame-src * file:" /> content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: *; frame-src * file:" />
<style> <style>
html, html,
body { body {
margin: 0; margin: 0;
} }
#spinner { #spinner {
position: fixed; position: fixed;
width: 100vw; width: 100vw;
@ -19,18 +20,21 @@
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background: rgba(255, 255, 255, 0.5);
} }
#spinner img { #spinner img {
width: 100px; width: 100px;
border-radius: 50px;
} }
</style> </style>
</head> </head>
<body>
<body>
<div id="root"></div> <div id="root"></div>
<div id="spinner"> <div id="spinner">
<img src="/src/assets/images/logo/cherry-text.svg" /> <img src="/src/assets/images/logo.png" />
</div> </div>
<script type="module" src="/src/main.tsx"></script> <script type="module" src="/src/main.tsx"></script>
</body> </body>
</html> </html>