mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-14 04:43:42 +01:00
LGUG2Z
e663e346ba
Merge of kfm's macOS core migration (wip-u-kfm2 9cb4f2fa) and the settings stack through S3 (wip-u-settings2 696d2929), both on wip-u-integ2. Two files conflicted, both macOS; every hunk is resolved the same way: take kfm's version of the file (its new shapes: komorebi_core Monitor/Workspace, workspace_config and monitor_config as free functions) and re-apply the S3 change to it, because the settings side only touched lines kfm moved. - komorebi-for-mac/komorebi/src/monitor.rs: conflict 1 (imports): kfm's header doc kept, the DEFAULT_CONTAINER_PADDING / DEFAULT_WORKSPACE_PADDING imports dropped (S3). Conflict 2 (std imports): kfm's side (no VecDeque). The four padding reads (the two default fallbacks in the monitor's workspace globals) call crate::settings::container_padding() / workspace_padding(); the now unused Ordering import is removed. - komorebi-for-mac/komorebi/src/static_config.rs: both conflicts are the padding defaults in kfm's free functions (workspace_config, monitor_config): kfm's text kept, the two defaults read from settings. Re-applied S3 in this file: apply_globals applies paddings, aspect ratio, layout_defaults and display_index_preferences as one Handle::update of a SharedDelta; the readers (layout_defaults, aspect ratio, display preferences, paddings) use the accessors; the statics' imports and the now unused AspectRatio imports are removed. komorebi-core and the shared crates read none of the removed statics (grep: only the unrelated DEFAULT_*_PADDING consts in komorebi-config), so no hook is needed. S3 semantics are unchanged from wip-u-settings2 (statics removed, one update per load, reload merges, a few keys reset); the pins are the settings crate's reload.rs and shared tests plus the KDE tests/config.rs. Verified: see the run in the progress log (macOS fake-CC clippy -D warnings -p komorebi-macos --all-targets clean at this revision).