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

fix: limit titlebar-area-* in mac (#9974)

Browse Source 
* fix: limit titlebar-area-* in mac

* fix: unused padding-right
This commit is contained in:
RieN 7z 2025-09-07 10:19:17 +08:00 committed by GitHub
parent b33b14b4b7
commit 3607341413
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/src/components/Tab/TabContainer.tsx
View File

@ -1,7 +1,7 @@
import { PlusOutlined } from '@ant-design/icons' import { PlusOutlined } from '@ant-design/icons'
import { Sortable, useDndReorder } from '@renderer/components/dnd' import { Sortable, useDndReorder } from '@renderer/components/dnd'
import Scrollbar from '@renderer/components/Scrollbar' import Scrollbar from '@renderer/components/Scrollbar'
import { isLinux, isMac, isWin } from '@renderer/config/constant' import { isMac } from '@renderer/config/constant'
import { DEFAULT_MIN_APPS } from '@renderer/config/minapps' import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
import { useTheme } from '@renderer/context/ThemeProvider' import { useTheme } from '@renderer/context/ThemeProvider'
import { useFullscreen } from '@renderer/hooks/useFullscreen' import { useFullscreen } from '@renderer/hooks/useFullscreen'
@ -290,9 +290,9 @@ const TabsBar = styled.div<{ $isFullscreen: boolean }>`
align-items: center; align-items: center;
gap: 5px; gap: 5px;
padding-left: ${({ $isFullscreen }) => (!$isFullscreen && isMac ? 'env(titlebar-area-x)' : '15px')}; padding-left: ${({ $isFullscreen }) => (!$isFullscreen && isMac ? 'env(titlebar-area-x)' : '15px')};
padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : isWin ? '140px' : isLinux ? '120px' : '12px')}; padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : '0')};
height: var(--navbar-height); height: var(--navbar-height);
min-height: env(titlebar-area-height); min-height: ${({ $isFullscreen }) => (!$isFullscreen && isMac ? 'env(titlebar-area-height)' : '')};
position: relative; position: relative;
-webkit-app-region: drag; -webkit-app-region: drag;

2
src/renderer/src/components/app/Navbar.tsx
View File

@ -69,7 +69,7 @@ const NavbarContainer = styled.div`
min-width: 100%; min-width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
min-height: env(titlebar-area-height); min-height: ${isMac ? 'env(titlebar-area-height)' : 'var(--navbar-height)'};
max-height: var(--navbar-height); max-height: var(--navbar-height);
margin-left: ${isMac ? 'calc(var(--sidebar-width) * -1)' : 0}; margin-left: ${isMac ? 'calc(var(--sidebar-width) * -1)' : 0};
padding-left: ${isMac ? 'env(titlebar-area-x)' : 0}; padding-left: ${isMac ? 'env(titlebar-area-x)' : 0};