Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-31 17:19:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: improve mac dock behavior (#15334)

Browse Source 
#### PR Dependency Tree


* **PR #15334** 👈

This tree was auto-generated by
[Charcoal](https://github.com/danerwilliams/charcoal)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Enhancements**
* Improved main-window restoration for deep links, second-instance
launches, tray/menu actions, and when recordings finish.
* Refined macOS Dock show/hide behavior with throttling for smoother
window visibility.
* Updated close-to-tray/close-to-background handling to better manage
the app’s window lifecycle.
* Ensured popup/dock visibility is consistent when opening new windows.
* Updated window behavior settings display so tray-related options
render correctly across platforms.
* **Localization**
* Updated Simplified Chinese wording for menubar window behavior title.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
DarkSky
2026-07-23 23:25:55 +08:00
committed by GitHub
parent 8001451fd5
commit 0d889bc643
9 changed files with 219 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/core/src/desktop/dialogs/setting/general-setting/appearance/index.tsx
+52 -46
View File
@@ -80,43 +80,47 @@ const MenubarSetting = () => {
/>
</SettingRow>
</SettingWrapper>
{traySetting.enabled && !environment.isMacOs ? (
{traySetting.enabled ? (
<SettingWrapper
id="windowBehavior"
title={t[
'com.affine.appearanceSettings.menubar.windowBehavior.title'
]()}
>
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.openOnLeftClick.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.openOnLeftClick.description'
]()}
>
<Switch
checked={traySetting.openOnLeftClick}
onChange={checked =>
traySettingService.setOpenOnLeftClick(checked)
}
/>
</SettingRow>
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.minimizeToTray.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.minimizeToTray.description'
]()}
>
<Switch
checked={traySetting.minimizeToTray}
onChange={checked =>
traySettingService.setMinimizeToTray(checked)
}
/>
</SettingRow>
{!environment.isMacOs ? (
<>
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.openOnLeftClick.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.openOnLeftClick.description'
]()}
>
<Switch
checked={traySetting.openOnLeftClick}
onChange={checked =>
traySettingService.setOpenOnLeftClick(checked)
}
/>
</SettingRow>
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.minimizeToTray.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.minimizeToTray.description'
]()}
>
<Switch
checked={traySetting.minimizeToTray}
onChange={checked =>
traySettingService.setMinimizeToTray(checked)
}
/>
</SettingRow>
</>
) : null}
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.closeToTray.toggle'
@@ -130,21 +134,23 @@ const MenubarSetting = () => {
onChange={checked => traySettingService.setCloseToTray(checked)}
/>
</SettingRow>
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.startMinimized.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.startMinimized.description'
]()}
>
<Switch
checked={traySetting.startMinimized}
onChange={checked =>
traySettingService.setStartMinimized(checked)
}
/>
</SettingRow>
{!environment.isMacOs ? (
<SettingRow
name={t[
'com.affine.appearanceSettings.menubar.windowBehavior.startMinimized.toggle'
]()}
desc={t[
'com.affine.appearanceSettings.menubar.windowBehavior.startMinimized.description'
]()}
>
<Switch
checked={traySetting.startMinimized}
onChange={checked =>
traySettingService.setStartMinimized(checked)
}
/>
</SettingRow>
) : null}
</SettingWrapper>
) : null}
</>