fix: adjust some windows style issues (#2454)

This commit is contained in:
Peng Xiao
2023-06-02 12:56:52 +08:00
committed by Himself65
parent d905c9b5cf
commit 99dc4fbf22
2 changed files with 8 additions and 9 deletions
@@ -191,10 +191,11 @@ export const windowAppControl = style({
WebkitAppRegion: 'no-drag', WebkitAppRegion: 'no-drag',
cursor: 'pointer', cursor: 'pointer',
display: 'inline-flex', display: 'inline-flex',
width: '32px', width: '42px',
height: '32px',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
borderRadius: '2px', borderRadius: '4px',
selectors: { selectors: {
'&[data-type="close"]:hover': { '&[data-type="close"]:hover': {
background: 'var(--affine-error-color)', background: 'var(--affine-error-color)',
@@ -22,15 +22,11 @@ export type SidebarHeaderProps = {
export const SidebarHeader = (props: SidebarHeaderProps) => { export const SidebarHeader = (props: SidebarHeaderProps) => {
const [open, setOpen] = useAtom(appSidebarOpenAtom); const [open, setOpen] = useAtom(appSidebarOpenAtom);
const environment = getEnvironment(); const environment = getEnvironment();
const isMacosDesktop = environment.isDesktop && environment.isMacOs;
return ( return (
<div <div className={navHeaderStyle} data-open={open}>
className={navHeaderStyle} {environment.isDesktop && (
data-is-macos-electron={isMacosDesktop}
data-open={open}
>
{isMacosDesktop && (
<> <>
{environment.isMacOs && <div style={{ flex: 1 }} />}
<IconButton <IconButton
size="middle" size="middle"
data-testid="app-sidebar-arrow-button-back" data-testid="app-sidebar-arrow-button-back"
@@ -57,6 +53,8 @@ export const SidebarHeader = (props: SidebarHeaderProps) => {
> >
<ArrowRightSmallIcon /> <ArrowRightSmallIcon />
</IconButton> </IconButton>
{!environment.isMacOs && <div style={{ flex: 1 }} />}
</> </>
)} )}
<IconButton <IconButton