diff --git a/src/main/config.ts b/src/main/config.ts index 23eb0d441f..84dc1b846d 100644 --- a/src/main/config.ts +++ b/src/main/config.ts @@ -12,12 +12,12 @@ export const DATA_PATH = getDataPath() export const titleBarOverlayDark = { height: 40, - color: 'rgba(0,0,0,0)', - symbolColor: '#ffffff' + color: 'rgba(255,255,255,0)', + symbolColor: '#fff' } export const titleBarOverlayLight = { height: 40, color: 'rgba(255,255,255,0)', - symbolColor: '#000000' + symbolColor: '#000' } diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts index be05cffe70..efbaae5fc8 100644 --- a/src/main/services/WindowService.ts +++ b/src/main/services/WindowService.ts @@ -64,7 +64,7 @@ export class WindowService { transparent: isMac, vibrancy: 'sidebar', visualEffectState: 'active', - titleBarStyle: isLinux ? 'default' : 'hidden', + titleBarStyle: 'hidden', titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight, backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF', darkTheme: nativeTheme.shouldUseDarkColors, diff --git a/src/renderer/src/components/app/Navbar.tsx b/src/renderer/src/components/app/Navbar.tsx index 9b0bb823a0..7e74464612 100644 --- a/src/renderer/src/components/app/Navbar.tsx +++ b/src/renderer/src/components/app/Navbar.tsx @@ -1,4 +1,4 @@ -import { isMac, isWindows } from '@renderer/config/constant' +import { isLinux, isMac, isWindows } from '@renderer/config/constant' import useNavBackgroundColor from '@renderer/hooks/useNavBackgroundColor' import type { FC, PropsWithChildren } from 'react' import type { HTMLAttributes } from 'react' @@ -63,6 +63,6 @@ const NavbarRightContainer = styled.div` display: flex; align-items: center; padding: 0 12px; - padding-right: ${isWindows ? '140px' : 12}; + padding-right: ${isWindows ? '140px' : isLinux ? '120px' : '12px'}; justify-content: flex-end; `