chore(deps): bump softprops/action-gh-release from 2 to 3

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2 to 3.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2...v3)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/windows.yaml

@@ -154,7 +154,7 @@ jobs:
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
           git tag -d nightly || true
           kokai release --no-emoji --add-links github:commits,issues --ref "${{ github.ref_name }}" >"CHANGELOG.md"
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@v3
         with:
           draft: true
           body_path: "CHANGELOG.md"
@@ -196,7 +196,7 @@ jobs:
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
           git tag -d nightly || true
           kokai release --no-emoji --add-links github:commits,issues --ref "$(git tag --points-at HEAD)" >"CHANGELOG.md"
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@v3
         with:
           body_path: "CHANGELOG.md"
           files: |

dependencies.json

@@ -28,7 +28,7 @@
         "anstyle-query 1.1.5 registry+https://github.com/rust-lang/crates.io-index",
         "anstyle-wincon 3.0.11 registry+https://github.com/rust-lang/crates.io-index",
         "anyhow 1.0.102 registry+https://github.com/rust-lang/crates.io-index",
-        "approx 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
+        "approx 0.3.2 registry+https://github.com/rust-lang/crates.io-index",
         "arboard 3.6.1 registry+https://github.com/rust-lang/crates.io-index",
         "arrayvec 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
         "as-slice 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
@@ -41,27 +41,25 @@
         "beef 0.5.2 registry+https://github.com/rust-lang/crates.io-index",
         "bit_field 0.10.3 registry+https://github.com/rust-lang/crates.io-index",
         "bitflags 1.3.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 2.11.1 registry+https://github.com/rust-lang/crates.io-index",
+        "bitflags 2.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bitstream-io 4.10.0 registry+https://github.com/rust-lang/crates.io-index",
+        "bitstream-io 4.9.0 registry+https://github.com/rust-lang/crates.io-index",
         "block-buffer 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
-        "by_address 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck 1.25.0 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck_derive 1.10.2 registry+https://github.com/rust-lang/crates.io-index",
-        "cc 1.2.61 registry+https://github.com/rust-lang/crates.io-index",
+        "cc 1.2.57 registry+https://github.com/rust-lang/crates.io-index",
         "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
         "cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
-        "chacha20 0.10.0 registry+https://github.com/rust-lang/crates.io-index",
         "chrono 0.4.44 registry+https://github.com/rust-lang/crates.io-index",
         "chrono-tz 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
-        "clap 4.6.1 registry+https://github.com/rust-lang/crates.io-index",
+        "clap 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
         "clap_builder 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_derive 4.6.1 registry+https://github.com/rust-lang/crates.io-index",
+        "clap_derive 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
         "clap_lex 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "color-eyre 0.6.5 registry+https://github.com/rust-lang/crates.io-index",
         "color-spantrace 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "colorchoice 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
+        "core2 0.4.0 registry+https://github.com/rust-lang/crates.io-index",
         "cpufeatures 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
-        "cpufeatures 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "crc32fast 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "crossbeam-channel 0.5.15 registry+https://github.com/rust-lang/crates.io-index",
         "crossbeam-deque 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -101,8 +99,7 @@
         "epaint_default_fonts 0.33.3 registry+https://github.com/rust-lang/crates.io-index",
         "equivalent 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "eyre 0.6.12 registry+https://github.com/rust-lang/crates.io-index",
-        "fast-srgb8 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
+        "fastrand 2.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fastrand 2.4.1 registry+https://github.com/rust-lang/crates.io-index",
         "fdeflate 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
         "filetime 0.2.27 registry+https://github.com/rust-lang/crates.io-index",
         "find-msvc-tools 0.1.9 registry+https://github.com/rust-lang/crates.io-index",
@@ -118,11 +115,12 @@
         "futures-sink 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "futures-task 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "futures-util 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
+        "getrandom 0.1.16 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.3.4 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
         "gif 0.11.4 registry+https://github.com/rust-lang/crates.io-index",
-        "gif 0.14.2 registry+https://github.com/rust-lang/crates.io-index",
+        "gif 0.14.1 registry+https://github.com/rust-lang/crates.io-index",
         "git2 0.20.4 registry+https://github.com/rust-lang/crates.io-index",
         "gl_generator 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
         "glob 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
@@ -134,7 +132,7 @@
         "hashbrown 0.12.3 registry+https://github.com/rust-lang/crates.io-index",
         "hashbrown 0.14.5 registry+https://github.com/rust-lang/crates.io-index",
         "hashbrown 0.15.5 registry+https://github.com/rust-lang/crates.io-index",
-        "hashbrown 0.17.0 registry+https://github.com/rust-lang/crates.io-index",
+        "hashbrown 0.16.1 registry+https://github.com/rust-lang/crates.io-index",
         "heck 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "hex 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "hex_color 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -145,15 +143,15 @@
         "iana-time-zone 0.1.65 registry+https://github.com/rust-lang/crates.io-index",
         "ident_case 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
         "idna 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "idna_adapter 1.2.2 registry+https://github.com/rust-lang/crates.io-index",
+        "idna_adapter 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "image 0.25.10 registry+https://github.com/rust-lang/crates.io-index",
         "image-webp 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
-        "imgref 1.12.1 registry+https://github.com/rust-lang/crates.io-index",
+        "imgref 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
         "indenter 0.3.4 registry+https://github.com/rust-lang/crates.io-index",
         "indexmap 1.9.3 registry+https://github.com/rust-lang/crates.io-index",
-        "indexmap 2.14.0 registry+https://github.com/rust-lang/crates.io-index",
+        "indexmap 2.13.0 registry+https://github.com/rust-lang/crates.io-index",
         "ipnet 2.12.0 registry+https://github.com/rust-lang/crates.io-index",
-        "iri-string 0.7.12 registry+https://github.com/rust-lang/crates.io-index",
+        "iri-string 0.7.10 registry+https://github.com/rust-lang/crates.io-index",
         "is_debug 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "is_terminal_polyfill 1.70.2 registry+https://github.com/rust-lang/crates.io-index",
         "itertools 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -162,9 +160,9 @@
         "jpeg-decoder 0.1.22 registry+https://github.com/rust-lang/crates.io-index",
         "khronos_api 3.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "lazy_static 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libc 0.2.186 registry+https://github.com/rust-lang/crates.io-index",
+        "libc 0.2.183 registry+https://github.com/rust-lang/crates.io-index",
         "libgit2-sys 0.18.3+1.9.2 registry+https://github.com/rust-lang/crates.io-index",
-        "libz-sys 1.1.28 registry+https://github.com/rust-lang/crates.io-index",
+        "libz-sys 1.1.25 registry+https://github.com/rust-lang/crates.io-index",
         "linked-hash-map 0.5.6 registry+https://github.com/rust-lang/crates.io-index",
         "litrs 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
         "lock_api 0.4.14 registry+https://github.com/rust-lang/crates.io-index",
@@ -182,13 +180,12 @@
         "moxcms 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
         "native-tls 0.2.18 registry+https://github.com/rust-lang/crates.io-index",
         "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
-        "no_std_io2 0.9.3 registry+https://github.com/rust-lang/crates.io-index",
         "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "ntapi 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
         "num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-conv 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
+        "num-conv 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "num-derive 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
         "num-integer 0.1.46 registry+https://github.com/rust-lang/crates.io-index",
         "num-iter 0.1.45 registry+https://github.com/rust-lang/crates.io-index",
@@ -199,15 +196,16 @@
         "once_cell 1.21.4 registry+https://github.com/rust-lang/crates.io-index",
         "once_cell_polyfill 1.70.2 registry+https://github.com/rust-lang/crates.io-index",
         "owned_ttf_parser 0.25.1 registry+https://github.com/rust-lang/crates.io-index",
-        "palette 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
+        "palette 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "palette_derive 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
+        "palette_derive 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "parking_lot 0.12.5 registry+https://github.com/rust-lang/crates.io-index",
         "parking_lot_core 0.9.12 registry+https://github.com/rust-lang/crates.io-index",
         "paste 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
         "pastey 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
         "percent-encoding 2.3.2 registry+https://github.com/rust-lang/crates.io-index",
         "pin-project-lite 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
-        "pkg-config 0.3.33 registry+https://github.com/rust-lang/crates.io-index",
+        "pin-utils 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
+        "pkg-config 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "png 0.16.8 registry+https://github.com/rust-lang/crates.io-index",
         "png 0.18.1 registry+https://github.com/rust-lang/crates.io-index",
         "powerfmt 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -215,21 +213,23 @@
         "proc-macro2 1.0.106 registry+https://github.com/rust-lang/crates.io-index",
         "profiling 1.0.17 registry+https://github.com/rust-lang/crates.io-index",
         "profiling-procmacros 1.0.17 registry+https://github.com/rust-lang/crates.io-index",
-        "psm 0.1.31 registry+https://github.com/rust-lang/crates.io-index",
+        "psm 0.1.30 registry+https://github.com/rust-lang/crates.io-index",
-        "pxfm 0.1.29 registry+https://github.com/rust-lang/crates.io-index",
+        "pxfm 0.1.28 registry+https://github.com/rust-lang/crates.io-index",
         "qoi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
         "quick-error 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
         "quote 1.0.45 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.10.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.7.3 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.9.4 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.9.2 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_chacha 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "rand_chacha 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
         "rand_chacha 0.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_core 0.10.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_core 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "rand_core 0.6.4 registry+https://github.com/rust-lang/crates.io-index",
         "rand_core 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_pcg 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
+        "rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
         "rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index",
         "ref-cast 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
         "ref-cast-impl 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
@@ -240,10 +240,10 @@
         "roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
         "rustc-demangle 0.1.27 registry+https://github.com/rust-lang/crates.io-index",
         "rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pki-types 1.14.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rustls-pki-types 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
         "ryu 1.0.23 registry+https://github.com/rust-lang/crates.io-index",
         "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "semver 1.0.28 registry+https://github.com/rust-lang/crates.io-index",
+        "semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index",
         "serde 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
         "serde_core 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
         "serde_derive 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
@@ -262,22 +262,22 @@
         "shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
         "shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "signature 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "siphasher 0.3.11 registry+https://github.com/rust-lang/crates.io-index",
         "siphasher 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "smallvec 1.15.1 registry+https://github.com/rust-lang/crates.io-index",
         "smol_str 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "socket2 0.6.3 registry+https://github.com/rust-lang/crates.io-index",
         "stable_deref_trait 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "stacker 0.1.24 registry+https://github.com/rust-lang/crates.io-index",
+        "stacker 0.1.23 registry+https://github.com/rust-lang/crates.io-index",
         "static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "supports-color 3.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "supports-hyperlinks 3.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "supports-unicode 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "symlink 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "syn 1.0.109 registry+https://github.com/rust-lang/crates.io-index",
         "syn 2.0.117 registry+https://github.com/rust-lang/crates.io-index",
         "sync_wrapper 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "tempfile 3.27.0 registry+https://github.com/rust-lang/crates.io-index",
-        "terminal_size 0.4.4 registry+https://github.com/rust-lang/crates.io-index",
+        "terminal_size 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "thiserror 2.0.18 registry+https://github.com/rust-lang/crates.io-index",
         "thiserror-impl 2.0.18 registry+https://github.com/rust-lang/crates.io-index",
         "thread_local 1.1.9 registry+https://github.com/rust-lang/crates.io-index",
@@ -285,14 +285,14 @@
         "time-core 0.1.8 registry+https://github.com/rust-lang/crates.io-index",
         "toml 0.5.11 registry+https://github.com/rust-lang/crates.io-index",
         "ttf-parser 0.25.1 registry+https://github.com/rust-lang/crates.io-index",
-        "typenum 1.20.0 registry+https://github.com/rust-lang/crates.io-index",
+        "typenum 1.19.0 registry+https://github.com/rust-lang/crates.io-index",
         "tz-rs 0.7.3 registry+https://github.com/rust-lang/crates.io-index",
         "tzdb 0.7.3 registry+https://github.com/rust-lang/crates.io-index",
         "tzdb_data 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
         "unicase 2.9.0 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-ident 1.0.24 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-linebreak 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-segmentation 1.13.2 registry+https://github.com/rust-lang/crates.io-index",
+        "unicode-segmentation 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-width 0.1.14 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-width 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-xid 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -300,11 +300,11 @@
         "url 2.5.8 registry+https://github.com/rust-lang/crates.io-index",
         "utf8_iter 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
         "utf8parse 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "uuid 1.23.1 registry+https://github.com/rust-lang/crates.io-index",
+        "uuid 1.22.0 registry+https://github.com/rust-lang/crates.io-index",
         "vcpkg 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
         "version_check 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
         "web-time 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "webbrowser 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
+        "webbrowser 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "weezl 0.1.12 registry+https://github.com/rust-lang/crates.io-index",
         "win-msgbox 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "winapi 0.3.9 registry+https://github.com/rust-lang/crates.io-index",
@@ -347,6 +347,7 @@
         "windows-strings 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.48.0 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
+        "windows-sys 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.60.2 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.61.2 registry+https://github.com/rust-lang/crates.io-index",
         "windows-targets 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
@@ -366,12 +367,12 @@
         "winit 0.30.13 registry+https://github.com/rust-lang/crates.io-index",
         "wmi 0.15.2 registry+https://github.com/rust-lang/crates.io-index",
         "yaml-rust 0.4.5 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.8.48 registry+https://github.com/rust-lang/crates.io-index",
+        "zerocopy 0.8.47 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.8.48 registry+https://github.com/rust-lang/crates.io-index",
+        "zerocopy-derive 0.8.47 registry+https://github.com/rust-lang/crates.io-index",
         "zeroize 1.8.2 registry+https://github.com/rust-lang/crates.io-index",
         "zune-core 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.5.15 registry+https://github.com/rust-lang/crates.io-index"
+        "zune-jpeg 0.5.14 registry+https://github.com/rust-lang/crates.io-index"
       ]
     ],
     [
@@ -393,8 +394,8 @@
         "av1-grain 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
         "rav1e 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
         "v_frame 0.3.9 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.8.48 registry+https://github.com/rust-lang/crates.io-index",
+        "zerocopy 0.8.47 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.8.48 registry+https://github.com/rust-lang/crates.io-index"
+        "zerocopy-derive 0.8.47 registry+https://github.com/rust-lang/crates.io-index"
       ]
     ],
     [
@@ -411,7 +412,7 @@
         "exr 1.74.0 registry+https://github.com/rust-lang/crates.io-index",
         "lebe 0.5.3 registry+https://github.com/rust-lang/crates.io-index",
         "moxcms 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "pxfm 0.1.29 registry+https://github.com/rust-lang/crates.io-index",
+        "pxfm 0.1.28 registry+https://github.com/rust-lang/crates.io-index",
         "ravif 0.13.0 registry+https://github.com/rust-lang/crates.io-index",
         "subtle 2.6.1 registry+https://github.com/rust-lang/crates.io-index"
       ]
@@ -428,9 +429,8 @@
       "CC0-1.0",
       [
         "dunce 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "fast-srgb8 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
         "file-id 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "imgref 1.12.1 registry+https://github.com/rust-lang/crates.io-index",
+        "imgref 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
         "notify 6.1.1 registry+https://github.com/rust-lang/crates.io-index",
         "notify-debouncer-full 0.1.0 registry+https://github.com/rust-lang/crates.io-index"
       ]
@@ -476,13 +476,12 @@
         "beef 0.5.2 registry+https://github.com/rust-lang/crates.io-index",
         "bit_field 0.10.3 registry+https://github.com/rust-lang/crates.io-index",
         "bitflags 1.3.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 2.11.1 registry+https://github.com/rust-lang/crates.io-index",
+        "bitflags 2.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bitstream-io 4.10.0 registry+https://github.com/rust-lang/crates.io-index",
+        "bitstream-io 4.9.0 registry+https://github.com/rust-lang/crates.io-index",
         "block-buffer 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
         "brotli 8.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "brotli-decompressor 5.0.0 registry+https://github.com/rust-lang/crates.io-index",
         "built 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
-        "by_address 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck 1.25.0 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck_derive 1.10.2 registry+https://github.com/rust-lang/crates.io-index",
         "byteorder 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -491,25 +490,24 @@
         "calm_io 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
         "calmio_filters 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "catppuccin-egui 5.6.0 git+https://github.com/LGUG2Z/catppuccin-egui?rev=b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a",
-        "cc 1.2.61 registry+https://github.com/rust-lang/crates.io-index",
+        "cc 1.2.57 registry+https://github.com/rust-lang/crates.io-index",
         "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
         "cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
         "cfg_aliases 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "chacha20 0.10.0 registry+https://github.com/rust-lang/crates.io-index",
         "chrono 0.4.44 registry+https://github.com/rust-lang/crates.io-index",
         "chrono-tz 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
         "chumsky 0.9.3 registry+https://github.com/rust-lang/crates.io-index",
-        "clap 4.6.1 registry+https://github.com/rust-lang/crates.io-index",
+        "clap 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
         "clap_builder 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_derive 4.6.1 registry+https://github.com/rust-lang/crates.io-index",
+        "clap_derive 4.6.0 registry+https://github.com/rust-lang/crates.io-index",
         "clap_lex 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "color-eyre 0.6.5 registry+https://github.com/rust-lang/crates.io-index",
         "color-spantrace 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "color-thief 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "color_quant 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "colorchoice 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
+        "core2 0.4.0 registry+https://github.com/rust-lang/crates.io-index",
         "cpufeatures 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
-        "cpufeatures 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "crc32fast 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "crossbeam-channel 0.5.15 registry+https://github.com/rust-lang/crates.io-index",
         "crossbeam-deque 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -553,14 +551,14 @@
         "equator-macro 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
         "equivalent 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "eyre 0.6.12 registry+https://github.com/rust-lang/crates.io-index",
-        "fast-srgb8 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
+        "fastrand 2.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fastrand 2.4.1 registry+https://github.com/rust-lang/crates.io-index",
+        "fax 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
-        "fax 0.2.7 registry+https://github.com/rust-lang/crates.io-index",
+        "fax_derive 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "fdeflate 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
         "filetime 0.2.27 registry+https://github.com/rust-lang/crates.io-index",
         "find-msvc-tools 0.1.9 registry+https://github.com/rust-lang/crates.io-index",
         "flate2 1.1.9 registry+https://github.com/rust-lang/crates.io-index",
-        "flavours 0.7.2 git+https://github.com/LGUG2Z/flavours?rev=24518c129918fe3260aa559eded7657e50752cb1",
+        "flavours 0.7.2 git+https://github.com/LGUG2Z/flavours",
         "fnv 1.0.7 registry+https://github.com/rust-lang/crates.io-index",
         "font-loader 0.11.0 registry+https://github.com/rust-lang/crates.io-index",
         "form_urlencoded 1.2.2 registry+https://github.com/rust-lang/crates.io-index",
@@ -575,11 +573,12 @@
         "futures-task 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "futures-util 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "generic-array 0.14.7 registry+https://github.com/rust-lang/crates.io-index",
+        "getrandom 0.1.16 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.3.4 registry+https://github.com/rust-lang/crates.io-index",
         "getrandom 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
         "gif 0.11.4 registry+https://github.com/rust-lang/crates.io-index",
-        "gif 0.14.2 registry+https://github.com/rust-lang/crates.io-index",
+        "gif 0.14.1 registry+https://github.com/rust-lang/crates.io-index",
         "git2 0.20.4 registry+https://github.com/rust-lang/crates.io-index",
         "glob 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
         "glow 0.16.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -589,7 +588,7 @@
         "hashbrown 0.12.3 registry+https://github.com/rust-lang/crates.io-index",
         "hashbrown 0.14.5 registry+https://github.com/rust-lang/crates.io-index",
         "hashbrown 0.15.5 registry+https://github.com/rust-lang/crates.io-index",
-        "hashbrown 0.17.0 registry+https://github.com/rust-lang/crates.io-index",
+        "hashbrown 0.16.1 registry+https://github.com/rust-lang/crates.io-index",
         "heck 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "hex 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "hex_color 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -598,21 +597,21 @@
         "http-body 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
         "http-body-util 0.1.3 registry+https://github.com/rust-lang/crates.io-index",
         "httparse 1.10.1 registry+https://github.com/rust-lang/crates.io-index",
-        "hyper 1.9.0 registry+https://github.com/rust-lang/crates.io-index",
+        "hyper 1.8.1 registry+https://github.com/rust-lang/crates.io-index",
         "hyper-tls 0.6.0 registry+https://github.com/rust-lang/crates.io-index",
         "hyper-util 0.1.20 registry+https://github.com/rust-lang/crates.io-index",
         "iana-time-zone 0.1.65 registry+https://github.com/rust-lang/crates.io-index",
         "ident_case 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
         "idna 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "idna_adapter 1.2.2 registry+https://github.com/rust-lang/crates.io-index",
+        "idna_adapter 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "image 0.23.14 registry+https://github.com/rust-lang/crates.io-index",
         "image 0.25.10 registry+https://github.com/rust-lang/crates.io-index",
         "image-webp 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
         "indenter 0.3.4 registry+https://github.com/rust-lang/crates.io-index",
         "indexmap 1.9.3 registry+https://github.com/rust-lang/crates.io-index",
-        "indexmap 2.14.0 registry+https://github.com/rust-lang/crates.io-index",
+        "indexmap 2.13.0 registry+https://github.com/rust-lang/crates.io-index",
         "ipnet 2.12.0 registry+https://github.com/rust-lang/crates.io-index",
-        "iri-string 0.7.12 registry+https://github.com/rust-lang/crates.io-index",
+        "iri-string 0.7.10 registry+https://github.com/rust-lang/crates.io-index",
         "is_debug 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "is_terminal_polyfill 1.70.2 registry+https://github.com/rust-lang/crates.io-index",
         "itertools 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -620,9 +619,9 @@
         "jobserver 0.1.34 registry+https://github.com/rust-lang/crates.io-index",
         "jpeg-decoder 0.1.22 registry+https://github.com/rust-lang/crates.io-index",
         "lazy_static 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libc 0.2.186 registry+https://github.com/rust-lang/crates.io-index",
+        "libc 0.2.183 registry+https://github.com/rust-lang/crates.io-index",
         "libgit2-sys 0.18.3+1.9.2 registry+https://github.com/rust-lang/crates.io-index",
-        "libz-sys 1.1.28 registry+https://github.com/rust-lang/crates.io-index",
+        "libz-sys 1.1.25 registry+https://github.com/rust-lang/crates.io-index",
         "linked-hash-map 0.5.6 registry+https://github.com/rust-lang/crates.io-index",
         "litrs 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
         "lock_api 0.4.14 registry+https://github.com/rust-lang/crates.io-index",
@@ -642,14 +641,13 @@
         "miniz_oxide 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
         "miniz_oxide 0.4.4 registry+https://github.com/rust-lang/crates.io-index",
         "miniz_oxide 0.8.9 registry+https://github.com/rust-lang/crates.io-index",
-        "mio 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "mio 1.1.1 registry+https://github.com/rust-lang/crates.io-index",
         "miow 0.6.1 registry+https://github.com/rust-lang/crates.io-index",
         "nanoid 0.4.0 registry+https://github.com/rust-lang/crates.io-index",
         "native-tls 0.2.18 registry+https://github.com/rust-lang/crates.io-index",
         "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
-        "netdev 0.41.0 registry+https://github.com/rust-lang/crates.io-index",
+        "netdev 0.40.1 registry+https://github.com/rust-lang/crates.io-index",
         "new_debug_unreachable 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "no_std_io2 0.9.3 registry+https://github.com/rust-lang/crates.io-index",
         "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "nom 7.1.3 registry+https://github.com/rust-lang/crates.io-index",
         "nom 8.0.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -659,7 +657,7 @@
         "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
         "num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-conv 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
+        "num-conv 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "num-derive 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
         "num-integer 0.1.46 registry+https://github.com/rust-lang/crates.io-index",
         "num-iter 0.1.45 registry+https://github.com/rust-lang/crates.io-index",
@@ -669,11 +667,11 @@
         "object 0.37.3 registry+https://github.com/rust-lang/crates.io-index",
         "once_cell 1.21.4 registry+https://github.com/rust-lang/crates.io-index",
         "once_cell_polyfill 1.70.2 registry+https://github.com/rust-lang/crates.io-index",
-        "open 5.3.4 registry+https://github.com/rust-lang/crates.io-index",
+        "open 5.3.3 registry+https://github.com/rust-lang/crates.io-index",
         "os_info 3.14.0 registry+https://github.com/rust-lang/crates.io-index",
         "owo-colors 4.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "palette 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
+        "palette 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "palette_derive 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
+        "palette_derive 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "parking_lot 0.12.5 registry+https://github.com/rust-lang/crates.io-index",
         "parking_lot_core 0.9.12 registry+https://github.com/rust-lang/crates.io-index",
         "paste 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
@@ -681,12 +679,15 @@
         "percent-encoding 2.3.2 registry+https://github.com/rust-lang/crates.io-index",
         "phf 0.11.3 registry+https://github.com/rust-lang/crates.io-index",
         "phf 0.12.1 registry+https://github.com/rust-lang/crates.io-index",
-        "phf_generator 0.11.3 registry+https://github.com/rust-lang/crates.io-index",
+        "phf 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
-        "phf_macros 0.11.3 registry+https://github.com/rust-lang/crates.io-index",
+        "phf_codegen 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
+        "phf_generator 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
         "phf_shared 0.11.3 registry+https://github.com/rust-lang/crates.io-index",
         "phf_shared 0.12.1 registry+https://github.com/rust-lang/crates.io-index",
+        "phf_shared 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
         "pin-project-lite 0.2.17 registry+https://github.com/rust-lang/crates.io-index",
-        "pkg-config 0.3.33 registry+https://github.com/rust-lang/crates.io-index",
+        "pin-utils 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
+        "pkg-config 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
         "png 0.16.8 registry+https://github.com/rust-lang/crates.io-index",
         "png 0.18.1 registry+https://github.com/rust-lang/crates.io-index",
         "powerfmt 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -695,21 +696,23 @@
         "proc-macro2 1.0.106 registry+https://github.com/rust-lang/crates.io-index",
         "profiling 1.0.17 registry+https://github.com/rust-lang/crates.io-index",
         "profiling-procmacros 1.0.17 registry+https://github.com/rust-lang/crates.io-index",
-        "psm 0.1.31 registry+https://github.com/rust-lang/crates.io-index",
+        "psm 0.1.30 registry+https://github.com/rust-lang/crates.io-index",
         "qoi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
         "quick-error 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
         "quote 1.0.45 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.10.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.7.3 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.9.4 registry+https://github.com/rust-lang/crates.io-index",
+        "rand 0.9.2 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_chacha 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "rand_chacha 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
         "rand_chacha 0.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_core 0.10.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_core 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "rand_core 0.6.4 registry+https://github.com/rust-lang/crates.io-index",
         "rand_core 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
+        "rand_pcg 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "random_word 0.5.2 registry+https://github.com/rust-lang/crates.io-index",
         "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
+        "rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
         "rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index",
         "ref-cast 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
         "ref-cast-impl 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
@@ -721,14 +724,14 @@
         "roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
         "rustc-demangle 0.1.27 registry+https://github.com/rust-lang/crates.io-index",
         "rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pki-types 1.14.1 registry+https://github.com/rust-lang/crates.io-index",
+        "rustls-pki-types 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
         "same-file 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
         "schannel 0.1.29 registry+https://github.com/rust-lang/crates.io-index",
         "schemars 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "schemars_derive 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "scoped_threadpool 0.1.9 registry+https://github.com/rust-lang/crates.io-index",
         "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "semver 1.0.28 registry+https://github.com/rust-lang/crates.io-index",
+        "semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index",
         "serde 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
         "serde_core 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
         "serde_derive 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
@@ -748,20 +751,20 @@
         "shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
         "shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index",
         "signature 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "simd-adler32 0.3.9 registry+https://github.com/rust-lang/crates.io-index",
+        "simd-adler32 0.3.8 registry+https://github.com/rust-lang/crates.io-index",
         "simd_helpers 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
+        "siphasher 0.3.11 registry+https://github.com/rust-lang/crates.io-index",
         "siphasher 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "slab 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
         "smallvec 1.15.1 registry+https://github.com/rust-lang/crates.io-index",
         "smol_str 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "socket2 0.6.3 registry+https://github.com/rust-lang/crates.io-index",
         "stable_deref_trait 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "stacker 0.1.24 registry+https://github.com/rust-lang/crates.io-index",
+        "stacker 0.1.23 registry+https://github.com/rust-lang/crates.io-index",
         "static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "strsim 0.11.1 registry+https://github.com/rust-lang/crates.io-index",
-        "strum 0.28.0 registry+https://github.com/rust-lang/crates.io-index",
+        "strum 0.27.2 registry+https://github.com/rust-lang/crates.io-index",
-        "strum_macros 0.28.0 registry+https://github.com/rust-lang/crates.io-index",
+        "strum_macros 0.27.2 registry+https://github.com/rust-lang/crates.io-index",
-        "symlink 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
         "syn 1.0.109 registry+https://github.com/rust-lang/crates.io-index",
         "syn 2.0.117 registry+https://github.com/rust-lang/crates.io-index",
         "synstructure 0.13.2 registry+https://github.com/rust-lang/crates.io-index",
@@ -769,7 +772,7 @@
         "sysinfo 0.38.4 registry+https://github.com/rust-lang/crates.io-index",
         "systray-util 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "tempfile 3.27.0 registry+https://github.com/rust-lang/crates.io-index",
-        "terminal_size 0.4.4 registry+https://github.com/rust-lang/crates.io-index",
+        "terminal_size 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
         "textwrap 0.16.2 registry+https://github.com/rust-lang/crates.io-index",
         "thiserror 2.0.18 registry+https://github.com/rust-lang/crates.io-index",
         "thiserror-impl 2.0.18 registry+https://github.com/rust-lang/crates.io-index",
@@ -778,8 +781,8 @@
         "tiff 0.6.1 registry+https://github.com/rust-lang/crates.io-index",
         "time 0.3.47 registry+https://github.com/rust-lang/crates.io-index",
         "time-core 0.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "tokio 1.52.1 registry+https://github.com/rust-lang/crates.io-index",
+        "tokio 1.50.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tokio-macros 2.7.0 registry+https://github.com/rust-lang/crates.io-index",
+        "tokio-macros 2.6.1 registry+https://github.com/rust-lang/crates.io-index",
         "tokio-native-tls 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
         "tokio-util 0.7.18 registry+https://github.com/rust-lang/crates.io-index",
         "toml 0.5.11 registry+https://github.com/rust-lang/crates.io-index",
@@ -788,7 +791,7 @@
         "tower-layer 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
         "tower-service 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
         "tracing 0.1.44 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-appender 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
+        "tracing-appender 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
         "tracing-attributes 0.1.31 registry+https://github.com/rust-lang/crates.io-index",
         "tracing-core 0.1.36 registry+https://github.com/rust-lang/crates.io-index",
         "tracing-error 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
@@ -796,13 +799,13 @@
         "tracing-subscriber 0.3.23 registry+https://github.com/rust-lang/crates.io-index",
         "try-lock 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
         "ttf-parser 0.25.1 registry+https://github.com/rust-lang/crates.io-index",
-        "typenum 1.20.0 registry+https://github.com/rust-lang/crates.io-index",
+        "typenum 1.19.0 registry+https://github.com/rust-lang/crates.io-index",
         "tz-rs 0.7.3 registry+https://github.com/rust-lang/crates.io-index",
         "tzdb_data 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
         "uds_windows 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
         "unicase 2.9.0 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-ident 1.0.24 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-segmentation 1.13.2 registry+https://github.com/rust-lang/crates.io-index",
+        "unicode-segmentation 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-width 0.1.14 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-width 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-xid 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -811,13 +814,13 @@
         "url 2.5.8 registry+https://github.com/rust-lang/crates.io-index",
         "utf8_iter 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
         "utf8parse 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "uuid 1.23.1 registry+https://github.com/rust-lang/crates.io-index",
+        "uuid 1.22.0 registry+https://github.com/rust-lang/crates.io-index",
         "vcpkg 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
         "version_check 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
         "walkdir 2.5.0 registry+https://github.com/rust-lang/crates.io-index",
         "want 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
         "web-time 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "webbrowser 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
+        "webbrowser 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "weezl 0.1.12 registry+https://github.com/rust-lang/crates.io-index",
         "which 8.0.2 registry+https://github.com/rust-lang/crates.io-index",
         "win-msgbox 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
@@ -864,6 +867,7 @@
         "windows-strings 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.48.0 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
+        "windows-sys 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.60.2 registry+https://github.com/rust-lang/crates.io-index",
         "windows-sys 0.61.2 registry+https://github.com/rust-lang/crates.io-index",
         "windows-targets 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
@@ -881,18 +885,18 @@
         "windows_x86_64_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
         "windows_x86_64_msvc 0.53.1 registry+https://github.com/rust-lang/crates.io-index",
         "winput 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
-        "winreg 0.56.0 registry+https://github.com/rust-lang/crates.io-index",
+        "winreg 0.55.0 registry+https://github.com/rust-lang/crates.io-index",
         "wmi 0.15.2 registry+https://github.com/rust-lang/crates.io-index",
         "xml-rs 0.8.28 registry+https://github.com/rust-lang/crates.io-index",
         "y4m 0.8.0 registry+https://github.com/rust-lang/crates.io-index",
         "yaml-rust 0.4.5 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.8.48 registry+https://github.com/rust-lang/crates.io-index",
+        "zerocopy 0.8.47 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.8.48 registry+https://github.com/rust-lang/crates.io-index",
+        "zerocopy-derive 0.8.47 registry+https://github.com/rust-lang/crates.io-index",
         "zeroize 1.8.2 registry+https://github.com/rust-lang/crates.io-index",
         "zmij 1.0.21 registry+https://github.com/rust-lang/crates.io-index",
         "zune-core 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.5.15 registry+https://github.com/rust-lang/crates.io-index"
+        "zune-jpeg 0.5.14 registry+https://github.com/rust-lang/crates.io-index"
       ]
     ],
     [
@@ -924,25 +928,25 @@
     [
       "Unicode-3.0",
       [
-        "icu_collections 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_collections 2.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_locale_core 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_locale_core 2.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_normalizer 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_normalizer 2.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_normalizer_data 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_normalizer_data 2.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_properties 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_properties 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_properties_data 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_properties_data 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_provider 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
+        "icu_provider 2.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "litemap 0.8.2 registry+https://github.com/rust-lang/crates.io-index",
+        "litemap 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "potential_utf 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
+        "potential_utf 0.1.4 registry+https://github.com/rust-lang/crates.io-index",
-        "tinystr 0.8.3 registry+https://github.com/rust-lang/crates.io-index",
+        "tinystr 0.8.2 registry+https://github.com/rust-lang/crates.io-index",
         "unicode-ident 1.0.24 registry+https://github.com/rust-lang/crates.io-index",
-        "writeable 0.6.3 registry+https://github.com/rust-lang/crates.io-index",
+        "writeable 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "yoke 0.8.2 registry+https://github.com/rust-lang/crates.io-index",
+        "yoke 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "yoke-derive 0.8.2 registry+https://github.com/rust-lang/crates.io-index",
+        "yoke-derive 0.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "zerofrom 0.1.7 registry+https://github.com/rust-lang/crates.io-index",
+        "zerofrom 0.1.6 registry+https://github.com/rust-lang/crates.io-index",
-        "zerofrom-derive 0.1.7 registry+https://github.com/rust-lang/crates.io-index",
+        "zerofrom-derive 0.1.6 registry+https://github.com/rust-lang/crates.io-index",
-        "zerotrie 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
+        "zerotrie 0.2.3 registry+https://github.com/rust-lang/crates.io-index",
-        "zerovec 0.11.6 registry+https://github.com/rust-lang/crates.io-index",
+        "zerovec 0.11.5 registry+https://github.com/rust-lang/crates.io-index",
-        "zerovec-derive 0.11.3 registry+https://github.com/rust-lang/crates.io-index"
+        "zerovec-derive 0.11.2 registry+https://github.com/rust-lang/crates.io-index"
       ]
     ],
     [
@@ -963,19 +967,17 @@
         "adler32 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck 1.25.0 registry+https://github.com/rust-lang/crates.io-index",
         "bytemuck_derive 1.10.2 registry+https://github.com/rust-lang/crates.io-index",
-        "const_format 0.2.36 registry+https://github.com/rust-lang/crates.io-index",
+        "const_format 0.2.35 registry+https://github.com/rust-lang/crates.io-index",
         "const_format_proc_macros 0.2.34 registry+https://github.com/rust-lang/crates.io-index",
         "cursor-icon 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
         "foldhash 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
         "glow 0.16.0 registry+https://github.com/rust-lang/crates.io-index",
-        "konst 0.2.20 registry+https://github.com/rust-lang/crates.io-index",
-        "konst_macro_rules 0.2.19 registry+https://github.com/rust-lang/crates.io-index",
         "miniz_oxide 0.4.4 registry+https://github.com/rust-lang/crates.io-index",
         "miniz_oxide 0.8.9 registry+https://github.com/rust-lang/crates.io-index",
         "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
         "zune-core 0.5.1 registry+https://github.com/rust-lang/crates.io-index",
         "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.5.15 registry+https://github.com/rust-lang/crates.io-index"
+        "zune-jpeg 0.5.14 registry+https://github.com/rust-lang/crates.io-index"
       ]
     ]
   ]

docs/common-workflows/layout-ratios.md

@@ -172,143 +172,6 @@ consistently to all splits of that type throughout the layout. Additional values
 - Unspecified ratios default to sharing the remaining space equally
 - You only need to specify the ratios you want to customize; trailing values can be omitted
 
-## Layout Options Rules
-
-You can dynamically change `layout_options` based on the number of containers on a workspace
-using `layout_options_rules`. This uses the same threshold-based logic as `layout_rules`:
-when the container count is greater than or equal to a threshold, the highest matching
-threshold's options are used.
-
-Rules **fully replace** the base `layout_options` when they match. If no rule matches, the
-base `layout_options` is used.
-
-### Configuration
-
-```json
-{
-  "monitors": [
-    {
-      "workspaces": [
-        {
-          "name": "main",
-          "layout": "VerticalStack",
-          "layout_options": {
-            "column_ratios": [0.6],
-            "row_ratios": [0.4]
-          },
-          "layout_options_rules": {
-            "3": { "column_ratios": [0.55] },
-            "5": { "column_ratios": [0.3, 0.3, 0.3], "row_ratios": [0.5] }
-          }
-        }
-      ]
-    }
-  ]
-}
-```
-
-In the example above:
-
-| Container Count | Effective `layout_options` |
-|-----------------|---------------------------|
-| 1-2 | Base: `column_ratios: [0.6]`, `row_ratios: [0.4]` |
-| 3-4 | Rule "3": `column_ratios: [0.55]` (no row_ratios, no scrolling, no grid) |
-| 5+ | Rule "5": `column_ratios: [0.3, 0.3, 0.3]`, `row_ratios: [0.5]` |
-
-Rules can include any field that `layout_options` supports: `column_ratios`, `row_ratios`,
-`scrolling`, and `grid`. When a rule matches, it completely replaces the base options. Fields
-not specified in the matching rule default to their standard defaults (not the base
-`layout_options` values).
-
-### Example: Scrolling Layout with Dynamic Columns
-
-```json
-{
-  "layout": "Scrolling",
-  "layout_options": {
-    "scrolling": { "columns": 2 }
-  },
-  "layout_options_rules": {
-    "4": { "scrolling": { "columns": 3 } },
-    "7": { "scrolling": { "columns": 4 } }
-  }
-}
-```
-
-This increases the visible scrolling columns as more windows are added.
-
-## Layout Defaults
-
-You can define global per-layout default `layout_options` and `layout_options_rules` using
-the top-level `layout_defaults` setting. This avoids repeating the same configuration across
-every workspace that uses the same layout.
-
-### Configuration
-
-```json
-{
-  "layout_defaults": {
-    "VerticalStack": {
-      "layout_options": { "column_ratios": [0.7] },
-      "layout_options_rules": {
-        "2": { "column_ratios": [0.7] },
-        "3": { "column_ratios": [0.55] },
-        "5": { "column_ratios": [0.4] }
-      }
-    },
-    "Columns": {
-      "layout_options": { "column_ratios": [0.3, 0.4] },
-      "layout_options_rules": {
-        "4": { "column_ratios": [0.2, 0.3, 0.3] }
-      }
-    },
-    "HorizontalStack": {
-      "layout_options": { "row_ratios": [0.6] }
-    }
-  },
-  "monitors": [
-    {
-      "workspaces": [
-        {
-          "name": "main",
-          "layout": "VerticalStack"
-        }
-      ]
-    }
-  ]
-}
-```
-
-In this example, every workspace using `VerticalStack`, `Columns`, or `HorizontalStack`
-automatically gets the global `layout_options` and `layout_options_rules` without needing
-to specify them per-workspace. Note that `VerticalStack` only has 2 columns (main + stack),
-so only a single `column_ratios` value is meaningful, while `Columns` distributes windows
-across multiple columns where additional ratios control each column's width.
-
-### Resolution Cascade
-
-Global defaults act as a fallback. If a workspace defines **either** `layout_options` or
-`layout_options_rules`, it **completely replaces** all global `layout_defaults` for that
-layout. Global defaults are only used when the workspace has **neither** setting.
-
-Within the effective source (workspace or global):
-1. Try threshold match from the rules (highest matching threshold wins)
-2. If a rule matches → use it (full replacement of base options)
-3. Otherwise → use the base `layout_options`
-
-### Override Examples
-
-| Workspace Config | Global Config | Effective Behavior |
-|------------------|---------------|--------------------|
-| No `layout_options`, no rules | `layout_defaults` has both | Uses global base + global rules |
-| Has `layout_options` only | `layout_defaults` has both | Workspace base only (all globals ignored) |
-| Has `layout_options_rules` only | `layout_defaults` has both | Workspace rules only (all globals ignored) |
-| Has both | `layout_defaults` has both | All workspace (all globals ignored) |
-
-This "complete replacement" semantic means you never get a mix of workspace and global
-settings for the same layout. If you override anything at the workspace level, you take
-full control of that layout's options for that workspace.
-
 ## Progressive Ratio Behavior
 
 Ratios are applied progressively as windows are added. For example, with `row_ratios: [0.3, 0.5]` in a VerticalStack:

komorebi-bar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-bar"
-version = "0.1.42"
+version = "0.1.41"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-bar/src/config.rs

@@ -15,7 +15,7 @@ use std::path::PathBuf;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-/// The `komorebi.bar.json` configuration file reference for `v0.1.42`
+/// The `komorebi.bar.json` configuration file reference for `v0.1.41`
 pub struct KomobarConfig {
     /// Bar height
     #[cfg_attr(feature = "schemars", schemars(extend("default" = 50)))]

komorebi-bar/src/widgets/systray.rs

@@ -723,7 +723,7 @@ impl Systray {
             .filter(|icon| icon.is_visible)
             .cloned()
             .collect();
-        icons.sort_by_key(|a| a.stable_id.to_string());
+        icons.sort_by(|a, b| a.stable_id.to_string().cmp(&b.stable_id.to_string()));
         icons
     }
 
@@ -731,7 +731,7 @@ impl Systray {
     fn get_all_icons() -> Vec<CachedIcon> {
         let state = SYSTRAY_STATE.lock();
         let mut icons: Vec<_> = state.icons.values().cloned().collect();
-        icons.sort_by_key(|a| a.stable_id.to_string());
+        icons.sort_by(|a, b| a.stable_id.to_string().cmp(&b.stable_id.to_string()));
         icons
     }
 

komorebi-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.42"
+version = "0.1.41"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-client/src/lib.rs

@@ -57,7 +57,6 @@ pub use komorebi::core::FloatingLayerBehaviour;
 pub use komorebi::core::FocusFollowsMouseImplementation;
 pub use komorebi::core::HidingBehaviour;
 pub use komorebi::core::Layout;
-pub use komorebi::core::MonocleFocusBehaviour;
 pub use komorebi::core::MoveBehaviour;
 pub use komorebi::core::OperationBehaviour;
 pub use komorebi::core::OperationDirection;

komorebi-gui/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-gui"
-version = "0.1.42"
+version = "0.1.41"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-layouts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-layouts"
-version = "0.1.42"
+version = "0.1.41"
 edition = "2024"
 
 [dependencies]

komorebi-layouts/src/default_layout.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use clap::ValueEnum;
 use serde::Deserialize;
 use serde::Serialize;
@@ -56,7 +54,7 @@ pub fn validate_ratios(ratios: &[f32]) -> [Option<f32>; MAX_RATIOS] {
 }
 
 #[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Eq, PartialEq, Hash, Display, EnumString, ValueEnum,
+    Clone, Copy, Debug, Serialize, Deserialize, Eq, PartialEq, Display, EnumString, ValueEnum,
 )]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 /// A predefined komorebi layout
@@ -252,21 +250,6 @@ pub struct GridLayoutOptions {
     pub rows: usize,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-/// Per-layout default options entry for the `layout_defaults` global setting.
-/// Contains both base layout options and threshold-based layout options rules.
-pub struct LayoutDefaultEntry {
-    /// Default layout options for this layout
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout_options: Option<LayoutOptions>,
-    /// Threshold-based layout options rules in the format of threshold => options.
-    /// When container count >= threshold, the highest matching threshold's options
-    /// fully replace the base `layout_options`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout_options_rules: Option<HashMap<usize, LayoutOptions>>,
-}
-
 impl DefaultLayout {
     pub fn leftmost_index(&self, len: usize) -> usize {
         match self {
@@ -437,5 +420,370 @@ impl DefaultLayout {
 }
 
 #[cfg(test)]
-#[path = "default_layout_tests.rs"]
+mod tests {
-mod tests;
+    use super::*;
+
+    // Helper to create LayoutOptions with column ratios
+    fn layout_options_with_column_ratios(ratios: &[f32]) -> LayoutOptions {
+        let mut arr = [None; MAX_RATIOS];
+        for (i, &r) in ratios.iter().take(MAX_RATIOS).enumerate() {
+            arr[i] = Some(r);
+        }
+        LayoutOptions {
+            scrolling: None,
+            grid: None,
+            column_ratios: Some(arr),
+            row_ratios: None,
+        }
+    }
+
+    // Helper to create LayoutOptions with row ratios
+    fn layout_options_with_row_ratios(ratios: &[f32]) -> LayoutOptions {
+        let mut arr = [None; MAX_RATIOS];
+        for (i, &r) in ratios.iter().take(MAX_RATIOS).enumerate() {
+            arr[i] = Some(r);
+        }
+        LayoutOptions {
+            scrolling: None,
+            grid: None,
+            column_ratios: None,
+            row_ratios: Some(arr),
+        }
+    }
+
+    // Helper to create LayoutOptions with both column and row ratios
+    fn layout_options_with_ratios(column_ratios: &[f32], row_ratios: &[f32]) -> LayoutOptions {
+        let mut col_arr = [None; MAX_RATIOS];
+        for (i, &r) in column_ratios.iter().take(MAX_RATIOS).enumerate() {
+            col_arr[i] = Some(r);
+        }
+        let mut row_arr = [None; MAX_RATIOS];
+        for (i, &r) in row_ratios.iter().take(MAX_RATIOS).enumerate() {
+            row_arr[i] = Some(r);
+        }
+        LayoutOptions {
+            scrolling: None,
+            grid: None,
+            column_ratios: Some(col_arr),
+            row_ratios: Some(row_arr),
+        }
+    }
+
+    mod deserialize_ratios_tests {
+        use super::*;
+
+        #[test]
+        fn test_deserialize_valid_ratios() {
+            let json = r#"{"column_ratios": [0.3, 0.4, 0.2]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            assert_eq!(ratios[0], Some(0.3));
+            assert_eq!(ratios[1], Some(0.4));
+            assert_eq!(ratios[2], Some(0.2));
+            assert_eq!(ratios[3], None);
+            assert_eq!(ratios[4], None);
+        }
+
+        #[test]
+        fn test_deserialize_clamps_values_to_min() {
+            // Values below MIN_RATIO should be clamped
+            let json = r#"{"column_ratios": [0.05]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            assert_eq!(ratios[0], Some(MIN_RATIO)); // Clamped to 0.1
+        }
+
+        #[test]
+        fn test_deserialize_clamps_values_to_max() {
+            // Values above MAX_RATIO should be clamped
+            let json = r#"{"column_ratios": [0.95]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            // 0.9 is the max, so it should be clamped
+            assert!(ratios[0].unwrap() <= MAX_RATIO);
+        }
+
+        #[test]
+        fn test_deserialize_truncates_when_sum_exceeds_one() {
+            // Sum of ratios should not reach 1.0
+            // [0.5, 0.4] = 0.9, then 0.3 would make it 1.2, so it should be truncated
+            let json = r#"{"column_ratios": [0.5, 0.4, 0.3]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            assert_eq!(ratios[0], Some(0.5));
+            assert_eq!(ratios[1], Some(0.4));
+            // Third ratio should be truncated because 0.5 + 0.4 + 0.3 >= 1.0
+            assert_eq!(ratios[2], None);
+        }
+
+        #[test]
+        fn test_deserialize_truncates_at_max_ratios() {
+            // More than MAX_RATIOS values should be truncated
+            let json = r#"{"column_ratios": [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            // Only MAX_RATIOS (5) values should be stored
+            for item in ratios.iter().take(MAX_RATIOS) {
+                assert_eq!(*item, Some(0.1));
+            }
+        }
+
+        #[test]
+        fn test_deserialize_empty_array() {
+            let json = r#"{"column_ratios": []}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.column_ratios.unwrap();
+            for item in ratios.iter().take(MAX_RATIOS) {
+                assert_eq!(*item, None);
+            }
+        }
+
+        #[test]
+        fn test_deserialize_null() {
+            let json = r#"{"column_ratios": null}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+            assert!(opts.column_ratios.is_none());
+        }
+
+        #[test]
+        fn test_deserialize_row_ratios() {
+            let json = r#"{"row_ratios": [0.3, 0.5]}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            let ratios = opts.row_ratios.unwrap();
+            assert_eq!(ratios[0], Some(0.3));
+            assert_eq!(ratios[1], Some(0.5));
+            assert_eq!(ratios[2], None);
+        }
+    }
+
+    mod serialize_ratios_tests {
+        use super::*;
+
+        #[test]
+        fn test_serialize_ratios_compact() {
+            let opts = layout_options_with_column_ratios(&[0.3, 0.4]);
+            let json = serde_json::to_string(&opts).unwrap();
+
+            // Should serialize ratios as compact array without trailing nulls in the ratios array
+            assert!(json.contains("0.3") && json.contains("0.4"));
+        }
+
+        #[test]
+        fn test_serialize_none_ratios() {
+            let opts = LayoutOptions {
+                scrolling: None,
+                grid: None,
+                column_ratios: None,
+                row_ratios: None,
+            };
+            let json = serde_json::to_string(&opts).unwrap();
+
+            // None values should serialize as null or be omitted
+            assert!(!json.contains("["));
+        }
+
+        #[test]
+        fn test_roundtrip_serialization() {
+            let original = layout_options_with_column_ratios(&[0.3, 0.4, 0.2]);
+            let json = serde_json::to_string(&original).unwrap();
+            let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
+
+            assert_eq!(original.column_ratios, deserialized.column_ratios);
+        }
+
+        #[test]
+        fn test_serialize_row_ratios() {
+            let opts = layout_options_with_row_ratios(&[0.3, 0.5]);
+            let json = serde_json::to_string(&opts).unwrap();
+
+            assert!(json.contains("row_ratios"));
+            assert!(json.contains("0.3") && json.contains("0.5"));
+        }
+
+        #[test]
+        fn test_roundtrip_row_ratios() {
+            let original = layout_options_with_row_ratios(&[0.4, 0.3]);
+            let json = serde_json::to_string(&original).unwrap();
+            let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
+
+            assert_eq!(original.row_ratios, deserialized.row_ratios);
+            assert!(original.column_ratios.is_none());
+        }
+
+        #[test]
+        fn test_roundtrip_both_ratios() {
+            let original = layout_options_with_ratios(&[0.3, 0.4], &[0.5, 0.3]);
+            let json = serde_json::to_string(&original).unwrap();
+            let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
+
+            assert_eq!(original.column_ratios, deserialized.column_ratios);
+            assert_eq!(original.row_ratios, deserialized.row_ratios);
+        }
+    }
+
+    mod ratio_constants_tests {
+        use super::*;
+
+        #[test]
+        fn test_constants_valid_ranges() {
+            const {
+                assert!(MIN_RATIO > 0.0);
+                assert!(MIN_RATIO < MAX_RATIO);
+                assert!(MAX_RATIO < 1.0);
+                assert!(DEFAULT_RATIO >= MIN_RATIO && DEFAULT_RATIO <= MAX_RATIO);
+                assert!(
+                    DEFAULT_SECONDARY_RATIO >= MIN_RATIO && DEFAULT_SECONDARY_RATIO <= MAX_RATIO
+                );
+                assert!(MAX_RATIOS >= 1);
+            }
+        }
+
+        #[test]
+        fn test_default_ratio_is_half() {
+            assert_eq!(DEFAULT_RATIO, 0.5);
+        }
+
+        #[test]
+        fn test_max_ratios_is_five() {
+            assert_eq!(MAX_RATIOS, 5);
+        }
+    }
+
+    mod layout_options_tests {
+        use super::*;
+
+        #[test]
+        fn test_layout_options_default_values() {
+            let json = r#"{}"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            assert!(opts.scrolling.is_none());
+            assert!(opts.grid.is_none());
+            assert!(opts.column_ratios.is_none());
+            assert!(opts.row_ratios.is_none());
+        }
+
+        #[test]
+        fn test_layout_options_with_all_fields() {
+            let json = r#"{
+                "scrolling": {"columns": 3},
+                "grid": {"rows": 2},
+                "column_ratios": [0.3, 0.4],
+                "row_ratios": [0.5]
+            }"#;
+            let opts: LayoutOptions = serde_json::from_str(json).unwrap();
+
+            assert!(opts.scrolling.is_some());
+            assert_eq!(opts.scrolling.unwrap().columns, 3);
+            assert!(opts.grid.is_some());
+            assert_eq!(opts.grid.unwrap().rows, 2);
+            assert!(opts.column_ratios.is_some());
+            assert!(opts.row_ratios.is_some());
+        }
+    }
+
+    mod default_layout_tests {
+        use super::*;
+
+        #[test]
+        fn test_cycle_next_covers_all_layouts() {
+            let start = DefaultLayout::BSP;
+            let mut current = start;
+            let mut visited = vec![current];
+
+            loop {
+                current = current.cycle_next();
+                if current == start {
+                    break;
+                }
+                assert!(
+                    !visited.contains(&current),
+                    "Cycle contains duplicate: {:?}",
+                    current
+                );
+                visited.push(current);
+            }
+
+            // Should have visited all layouts
+            assert_eq!(visited.len(), 9); // 9 layouts total
+        }
+
+        #[test]
+        fn test_cycle_previous_is_inverse_of_next() {
+            // Note: cycle_previous has some inconsistencies in the current implementation
+            // This test documents the expected behavior for most layouts
+            let layouts_with_correct_inverse = [
+                DefaultLayout::Columns,
+                DefaultLayout::Rows,
+                DefaultLayout::VerticalStack,
+                DefaultLayout::HorizontalStack,
+                DefaultLayout::UltrawideVerticalStack,
+                DefaultLayout::Grid,
+                DefaultLayout::RightMainVerticalStack,
+            ];
+
+            for layout in layouts_with_correct_inverse {
+                let next = layout.cycle_next();
+                assert_eq!(
+                    next.cycle_previous(),
+                    layout,
+                    "cycle_previous should be inverse of cycle_next for {:?}",
+                    layout
+                );
+            }
+        }
+
+        #[test]
+        fn test_leftmost_index_standard_layouts() {
+            assert_eq!(DefaultLayout::BSP.leftmost_index(5), 0);
+            assert_eq!(DefaultLayout::Columns.leftmost_index(5), 0);
+            assert_eq!(DefaultLayout::Rows.leftmost_index(5), 0);
+            assert_eq!(DefaultLayout::VerticalStack.leftmost_index(5), 0);
+            assert_eq!(DefaultLayout::HorizontalStack.leftmost_index(5), 0);
+            assert_eq!(DefaultLayout::Grid.leftmost_index(5), 0);
+        }
+
+        #[test]
+        fn test_leftmost_index_ultrawide() {
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(1), 0);
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(2), 1);
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(5), 1);
+        }
+
+        #[test]
+        fn test_leftmost_index_right_main() {
+            assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(1), 0);
+            assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(2), 1);
+            assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(5), 1);
+        }
+
+        #[test]
+        fn test_rightmost_index_standard_layouts() {
+            assert_eq!(DefaultLayout::BSP.rightmost_index(5), 4);
+            assert_eq!(DefaultLayout::Columns.rightmost_index(5), 4);
+            assert_eq!(DefaultLayout::Rows.rightmost_index(5), 4);
+            assert_eq!(DefaultLayout::VerticalStack.rightmost_index(5), 4);
+        }
+
+        #[test]
+        fn test_rightmost_index_right_main() {
+            assert_eq!(DefaultLayout::RightMainVerticalStack.rightmost_index(1), 0);
+            assert_eq!(DefaultLayout::RightMainVerticalStack.rightmost_index(5), 0);
+        }
+
+        #[test]
+        fn test_rightmost_index_ultrawide() {
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(1), 0);
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(2), 0);
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(3), 2);
+            assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(5), 4);
+        }
+    }
+}

komorebi-layouts/src/default_layout_tests.rs

@@ -1,954 +0,0 @@
-use super::*;
-
-// Helper to create LayoutOptions with column ratios
-fn layout_options_with_column_ratios(ratios: &[f32]) -> LayoutOptions {
-    let mut arr = [None; MAX_RATIOS];
-    for (i, &r) in ratios.iter().take(MAX_RATIOS).enumerate() {
-        arr[i] = Some(r);
-    }
-    LayoutOptions {
-        scrolling: None,
-        grid: None,
-        column_ratios: Some(arr),
-        row_ratios: None,
-    }
-}
-
-// Helper to create LayoutOptions with row ratios
-fn layout_options_with_row_ratios(ratios: &[f32]) -> LayoutOptions {
-    let mut arr = [None; MAX_RATIOS];
-    for (i, &r) in ratios.iter().take(MAX_RATIOS).enumerate() {
-        arr[i] = Some(r);
-    }
-    LayoutOptions {
-        scrolling: None,
-        grid: None,
-        column_ratios: None,
-        row_ratios: Some(arr),
-    }
-}
-
-// Helper to create LayoutOptions with both column and row ratios
-fn layout_options_with_ratios(column_ratios: &[f32], row_ratios: &[f32]) -> LayoutOptions {
-    let mut col_arr = [None; MAX_RATIOS];
-    for (i, &r) in column_ratios.iter().take(MAX_RATIOS).enumerate() {
-        col_arr[i] = Some(r);
-    }
-    let mut row_arr = [None; MAX_RATIOS];
-    for (i, &r) in row_ratios.iter().take(MAX_RATIOS).enumerate() {
-        row_arr[i] = Some(r);
-    }
-    LayoutOptions {
-        scrolling: None,
-        grid: None,
-        column_ratios: Some(col_arr),
-        row_ratios: Some(row_arr),
-    }
-}
-
-mod deserialize_ratios_tests {
-    use super::*;
-
-    #[test]
-    fn test_deserialize_valid_ratios() {
-        let json = r#"{"column_ratios": [0.3, 0.4, 0.2]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        assert_eq!(ratios[0], Some(0.3));
-        assert_eq!(ratios[1], Some(0.4));
-        assert_eq!(ratios[2], Some(0.2));
-        assert_eq!(ratios[3], None);
-        assert_eq!(ratios[4], None);
-    }
-
-    #[test]
-    fn test_deserialize_clamps_values_to_min() {
-        // Values below MIN_RATIO should be clamped
-        let json = r#"{"column_ratios": [0.05]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        assert_eq!(ratios[0], Some(MIN_RATIO)); // Clamped to 0.1
-    }
-
-    #[test]
-    fn test_deserialize_clamps_values_to_max() {
-        // Values above MAX_RATIO should be clamped
-        let json = r#"{"column_ratios": [0.95]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        // 0.9 is the max, so it should be clamped
-        assert!(ratios[0].unwrap() <= MAX_RATIO);
-    }
-
-    #[test]
-    fn test_deserialize_truncates_when_sum_exceeds_one() {
-        // Sum of ratios should not reach 1.0
-        // [0.5, 0.4] = 0.9, then 0.3 would make it 1.2, so it should be truncated
-        let json = r#"{"column_ratios": [0.5, 0.4, 0.3]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        assert_eq!(ratios[0], Some(0.5));
-        assert_eq!(ratios[1], Some(0.4));
-        // Third ratio should be truncated because 0.5 + 0.4 + 0.3 >= 1.0
-        assert_eq!(ratios[2], None);
-    }
-
-    #[test]
-    fn test_deserialize_truncates_at_max_ratios() {
-        // More than MAX_RATIOS values should be truncated
-        let json = r#"{"column_ratios": [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        // Only MAX_RATIOS (5) values should be stored
-        for item in ratios.iter().take(MAX_RATIOS) {
-            assert_eq!(*item, Some(0.1));
-        }
-    }
-
-    #[test]
-    fn test_deserialize_empty_array() {
-        let json = r#"{"column_ratios": []}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.column_ratios.unwrap();
-        for item in ratios.iter().take(MAX_RATIOS) {
-            assert_eq!(*item, None);
-        }
-    }
-
-    #[test]
-    fn test_deserialize_null() {
-        let json = r#"{"column_ratios": null}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-        assert!(opts.column_ratios.is_none());
-    }
-
-    #[test]
-    fn test_deserialize_row_ratios() {
-        let json = r#"{"row_ratios": [0.3, 0.5]}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        let ratios = opts.row_ratios.unwrap();
-        assert_eq!(ratios[0], Some(0.3));
-        assert_eq!(ratios[1], Some(0.5));
-        assert_eq!(ratios[2], None);
-    }
-}
-
-mod serialize_ratios_tests {
-    use super::*;
-
-    #[test]
-    fn test_serialize_ratios_compact() {
-        let opts = layout_options_with_column_ratios(&[0.3, 0.4]);
-        let json = serde_json::to_string(&opts).unwrap();
-
-        // Should serialize ratios as compact array without trailing nulls in the ratios array
-        assert!(json.contains("0.3") && json.contains("0.4"));
-    }
-
-    #[test]
-    fn test_serialize_none_ratios() {
-        let opts = LayoutOptions {
-            scrolling: None,
-            grid: None,
-            column_ratios: None,
-            row_ratios: None,
-        };
-        let json = serde_json::to_string(&opts).unwrap();
-
-        // None values should serialize as null or be omitted
-        assert!(!json.contains("["));
-    }
-
-    #[test]
-    fn test_roundtrip_serialization() {
-        let original = layout_options_with_column_ratios(&[0.3, 0.4, 0.2]);
-        let json = serde_json::to_string(&original).unwrap();
-        let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(original.column_ratios, deserialized.column_ratios);
-    }
-
-    #[test]
-    fn test_serialize_row_ratios() {
-        let opts = layout_options_with_row_ratios(&[0.3, 0.5]);
-        let json = serde_json::to_string(&opts).unwrap();
-
-        assert!(json.contains("row_ratios"));
-        assert!(json.contains("0.3") && json.contains("0.5"));
-    }
-
-    #[test]
-    fn test_roundtrip_row_ratios() {
-        let original = layout_options_with_row_ratios(&[0.4, 0.3]);
-        let json = serde_json::to_string(&original).unwrap();
-        let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(original.row_ratios, deserialized.row_ratios);
-        assert!(original.column_ratios.is_none());
-    }
-
-    #[test]
-    fn test_roundtrip_both_ratios() {
-        let original = layout_options_with_ratios(&[0.3, 0.4], &[0.5, 0.3]);
-        let json = serde_json::to_string(&original).unwrap();
-        let deserialized: LayoutOptions = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(original.column_ratios, deserialized.column_ratios);
-        assert_eq!(original.row_ratios, deserialized.row_ratios);
-    }
-}
-
-mod ratio_constants_tests {
-    use super::*;
-
-    #[test]
-    fn test_constants_valid_ranges() {
-        const {
-            assert!(MIN_RATIO > 0.0);
-            assert!(MIN_RATIO < MAX_RATIO);
-            assert!(MAX_RATIO < 1.0);
-            assert!(DEFAULT_RATIO >= MIN_RATIO && DEFAULT_RATIO <= MAX_RATIO);
-            assert!(DEFAULT_SECONDARY_RATIO >= MIN_RATIO && DEFAULT_SECONDARY_RATIO <= MAX_RATIO);
-            assert!(MAX_RATIOS >= 1);
-        }
-    }
-
-    #[test]
-    fn test_default_ratio_is_half() {
-        assert_eq!(DEFAULT_RATIO, 0.5);
-    }
-
-    #[test]
-    fn test_max_ratios_is_five() {
-        assert_eq!(MAX_RATIOS, 5);
-    }
-}
-
-mod layout_options_tests {
-    use super::*;
-
-    #[test]
-    fn test_layout_options_default_values() {
-        let json = r#"{}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        assert!(opts.scrolling.is_none());
-        assert!(opts.grid.is_none());
-        assert!(opts.column_ratios.is_none());
-        assert!(opts.row_ratios.is_none());
-    }
-
-    #[test]
-    fn test_layout_options_with_all_fields() {
-        let json = r#"{
-            "scrolling": {"columns": 3},
-            "grid": {"rows": 2},
-            "column_ratios": [0.3, 0.4],
-            "row_ratios": [0.5]
-        }"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-
-        assert!(opts.scrolling.is_some());
-        assert_eq!(opts.scrolling.unwrap().columns, 3);
-        assert!(opts.grid.is_some());
-        assert_eq!(opts.grid.unwrap().rows, 2);
-        assert!(opts.column_ratios.is_some());
-        assert!(opts.row_ratios.is_some());
-    }
-}
-
-mod default_layout_tests {
-    use super::*;
-
-    #[test]
-    fn test_cycle_next_covers_all_layouts() {
-        let start = DefaultLayout::BSP;
-        let mut current = start;
-        let mut visited = vec![current];
-
-        loop {
-            current = current.cycle_next();
-            if current == start {
-                break;
-            }
-            assert!(
-                !visited.contains(&current),
-                "Cycle contains duplicate: {:?}",
-                current
-            );
-            visited.push(current);
-        }
-
-        // Should have visited all layouts
-        assert_eq!(visited.len(), 9); // 9 layouts total
-    }
-
-    #[test]
-    fn test_cycle_previous_is_inverse_of_next() {
-        // Note: cycle_previous has some inconsistencies in the current implementation
-        // This test documents the expected behavior for most layouts
-        let layouts_with_correct_inverse = [
-            DefaultLayout::Columns,
-            DefaultLayout::Rows,
-            DefaultLayout::VerticalStack,
-            DefaultLayout::HorizontalStack,
-            DefaultLayout::UltrawideVerticalStack,
-            DefaultLayout::Grid,
-            DefaultLayout::RightMainVerticalStack,
-        ];
-
-        for layout in layouts_with_correct_inverse {
-            let next = layout.cycle_next();
-            assert_eq!(
-                next.cycle_previous(),
-                layout,
-                "cycle_previous should be inverse of cycle_next for {:?}",
-                layout
-            );
-        }
-    }
-
-    #[test]
-    fn test_leftmost_index_standard_layouts() {
-        assert_eq!(DefaultLayout::BSP.leftmost_index(5), 0);
-        assert_eq!(DefaultLayout::Columns.leftmost_index(5), 0);
-        assert_eq!(DefaultLayout::Rows.leftmost_index(5), 0);
-        assert_eq!(DefaultLayout::VerticalStack.leftmost_index(5), 0);
-        assert_eq!(DefaultLayout::HorizontalStack.leftmost_index(5), 0);
-        assert_eq!(DefaultLayout::Grid.leftmost_index(5), 0);
-    }
-
-    #[test]
-    fn test_leftmost_index_ultrawide() {
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(1), 0);
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(2), 1);
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.leftmost_index(5), 1);
-    }
-
-    #[test]
-    fn test_leftmost_index_right_main() {
-        assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(1), 0);
-        assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(2), 1);
-        assert_eq!(DefaultLayout::RightMainVerticalStack.leftmost_index(5), 1);
-    }
-
-    #[test]
-    fn test_rightmost_index_standard_layouts() {
-        assert_eq!(DefaultLayout::BSP.rightmost_index(5), 4);
-        assert_eq!(DefaultLayout::Columns.rightmost_index(5), 4);
-        assert_eq!(DefaultLayout::Rows.rightmost_index(5), 4);
-        assert_eq!(DefaultLayout::VerticalStack.rightmost_index(5), 4);
-    }
-
-    #[test]
-    fn test_rightmost_index_right_main() {
-        assert_eq!(DefaultLayout::RightMainVerticalStack.rightmost_index(1), 0);
-        assert_eq!(DefaultLayout::RightMainVerticalStack.rightmost_index(5), 0);
-    }
-
-    #[test]
-    fn test_rightmost_index_ultrawide() {
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(1), 0);
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(2), 0);
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(3), 2);
-        assert_eq!(DefaultLayout::UltrawideVerticalStack.rightmost_index(5), 4);
-    }
-}
-
-mod layout_options_rules_tests {
-    use super::*;
-
-    #[test]
-    fn test_hashmap_deserialization_ratios_only() {
-        // layout_options_rules entries with only ratios
-        // Note: ratios must sum to < 1.0 to avoid truncation by validate_ratios
-        let json = r#"{
-            "2": {"column_ratios": [0.7]},
-            "3": {"column_ratios": [0.55]},
-            "5": {"column_ratios": [0.3, 0.3, 0.3]}
-        }"#;
-        let rules: std::collections::HashMap<usize, LayoutOptions> =
-            serde_json::from_str(json).unwrap();
-        assert_eq!(rules.len(), 3);
-        assert_eq!(rules[&2].column_ratios.unwrap()[0], Some(0.7));
-        assert_eq!(rules[&3].column_ratios.unwrap()[0], Some(0.55));
-        let r5 = rules[&5].column_ratios.unwrap();
-        assert_eq!(r5[0], Some(0.3));
-        assert_eq!(r5[1], Some(0.3));
-        assert_eq!(r5[2], Some(0.3));
-        // No scrolling/grid in these entries
-        assert!(rules[&2].scrolling.is_none());
-        assert!(rules[&2].grid.is_none());
-    }
-
-    #[test]
-    fn test_hashmap_deserialization_full_options() {
-        // layout_options_rules entries with full options including scrolling/grid
-        let json = r#"{
-            "2": {"column_ratios": [0.7], "scrolling": {"columns": 3}},
-            "5": {"column_ratios": [0.3, 0.3, 0.3], "grid": {"rows": 2}}
-        }"#;
-        let rules: std::collections::HashMap<usize, LayoutOptions> =
-            serde_json::from_str(json).unwrap();
-        assert_eq!(rules.len(), 2);
-        assert_eq!(rules[&2].scrolling.unwrap().columns, 3);
-        assert!(rules[&2].grid.is_none());
-        assert!(rules[&5].scrolling.is_none());
-        assert_eq!(rules[&5].grid.unwrap().rows, 2);
-    }
-
-    #[test]
-    fn test_rule_entry_with_all_fields() {
-        let json = r#"{
-            "column_ratios": [0.6, 0.3],
-            "scrolling": {"columns": 4, "center_focused_column": true},
-            "grid": {"rows": 2},
-            "row_ratios": [0.5]
-        }"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-        let col = opts.column_ratios.unwrap();
-        assert_eq!(col[0], Some(0.6));
-        assert_eq!(col[1], Some(0.3));
-        let row = opts.row_ratios.unwrap();
-        assert_eq!(row[0], Some(0.5));
-        assert_eq!(opts.scrolling.unwrap().columns, 4);
-        assert_eq!(opts.scrolling.unwrap().center_focused_column, Some(true));
-        assert_eq!(opts.grid.unwrap().rows, 2);
-    }
-
-    #[test]
-    fn test_rule_entry_empty_object_gives_defaults() {
-        let json = r#"{}"#;
-        let opts: LayoutOptions = serde_json::from_str(json).unwrap();
-        assert!(opts.column_ratios.is_none());
-        assert!(opts.row_ratios.is_none());
-        assert!(opts.scrolling.is_none());
-        assert!(opts.grid.is_none());
-    }
-}
-
-mod layout_default_entry_tests {
-    use super::*;
-    use std::collections::HashMap;
-
-    #[test]
-    fn test_default_layout_as_hashmap_key() {
-        let mut map: HashMap<DefaultLayout, &str> = HashMap::new();
-        map.insert(DefaultLayout::BSP, "bsp");
-        map.insert(DefaultLayout::VerticalStack, "vstack");
-        map.insert(DefaultLayout::Columns, "cols");
-
-        assert_eq!(map.len(), 3);
-        assert_eq!(map[&DefaultLayout::BSP], "bsp");
-        assert_eq!(map[&DefaultLayout::VerticalStack], "vstack");
-        assert_eq!(map[&DefaultLayout::Columns], "cols");
-    }
-
-    #[test]
-    fn test_default_layout_hash_consistency() {
-        // Same variant inserted twice should overwrite
-        let mut map: HashMap<DefaultLayout, i32> = HashMap::new();
-        map.insert(DefaultLayout::Grid, 1);
-        map.insert(DefaultLayout::Grid, 2);
-        assert_eq!(map.len(), 1);
-        assert_eq!(map[&DefaultLayout::Grid], 2);
-    }
-
-    #[test]
-    fn test_layout_default_entry_deserialize_full() {
-        let json = r#"{
-            "layout_options": {"column_ratios": [0.7]},
-            "layout_options_rules": {
-                "2": {"column_ratios": [0.7]},
-                "3": {"column_ratios": [0.55]},
-                "5": {"column_ratios": [0.3, 0.3, 0.3]}
-            }
-        }"#;
-        let entry: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-
-        let base = entry.layout_options.unwrap();
-        assert_eq!(base.column_ratios.unwrap()[0], Some(0.7));
-
-        let rules = entry.layout_options_rules.unwrap();
-        assert_eq!(rules.len(), 3);
-        assert_eq!(rules[&2].column_ratios.unwrap()[0], Some(0.7));
-        assert_eq!(rules[&3].column_ratios.unwrap()[0], Some(0.55));
-        let r5 = rules[&5].column_ratios.unwrap();
-        assert_eq!(r5[0], Some(0.3));
-        assert_eq!(r5[1], Some(0.3));
-        assert_eq!(r5[2], Some(0.3));
-    }
-
-    #[test]
-    fn test_layout_default_entry_deserialize_only_base() {
-        let json = r#"{
-            "layout_options": {"column_ratios": [0.6]}
-        }"#;
-        let entry: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-
-        assert!(entry.layout_options.is_some());
-        assert_eq!(
-            entry.layout_options.unwrap().column_ratios.unwrap()[0],
-            Some(0.6)
-        );
-        assert!(entry.layout_options_rules.is_none());
-    }
-
-    #[test]
-    fn test_layout_default_entry_deserialize_only_rules() {
-        let json = r#"{
-            "layout_options_rules": {
-                "3": {"column_ratios": [0.4]}
-            }
-        }"#;
-        let entry: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-
-        assert!(entry.layout_options.is_none());
-        let rules = entry.layout_options_rules.unwrap();
-        assert_eq!(rules.len(), 1);
-        assert_eq!(rules[&3].column_ratios.unwrap()[0], Some(0.4));
-    }
-
-    #[test]
-    fn test_layout_default_entry_deserialize_empty() {
-        let json = r#"{}"#;
-        let entry: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-        assert!(entry.layout_options.is_none());
-        assert!(entry.layout_options_rules.is_none());
-    }
-
-    #[test]
-    fn test_layout_default_entry_roundtrip() {
-        let json = r#"{
-            "layout_options": {"column_ratios": [0.7]},
-            "layout_options_rules": {
-                "2": {"column_ratios": [0.6]},
-                "5": {"column_ratios": [0.3, 0.3, 0.3]}
-            }
-        }"#;
-        let original: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-        let serialized = serde_json::to_string(&original).unwrap();
-        let deserialized: LayoutDefaultEntry = serde_json::from_str(&serialized).unwrap();
-
-        assert_eq!(
-            original.layout_options.unwrap().column_ratios,
-            deserialized.layout_options.unwrap().column_ratios
-        );
-        let orig_rules = original.layout_options_rules.unwrap();
-        let deser_rules = deserialized.layout_options_rules.unwrap();
-        assert_eq!(orig_rules.len(), deser_rules.len());
-        for (key, orig_opts) in &orig_rules {
-            let deser_opts = &deser_rules[key];
-            assert_eq!(orig_opts.column_ratios, deser_opts.column_ratios);
-        }
-    }
-
-    #[test]
-    fn test_layout_defaults_full_config_deserialize() {
-        // Simulate the top-level layout_defaults field
-        let json = r#"{
-            "VerticalStack": {
-                "layout_options": {"column_ratios": [0.7]},
-                "layout_options_rules": {
-                    "2": {"column_ratios": [0.7]},
-                    "3": {"column_ratios": [0.55]}
-                }
-            },
-            "HorizontalStack": {
-                "layout_options": {"column_ratios": [0.6]}
-            },
-            "Columns": {
-                "layout_options_rules": {
-                    "4": {"column_ratios": [0.3, 0.3, 0.3]}
-                }
-            }
-        }"#;
-        let defaults: HashMap<DefaultLayout, LayoutDefaultEntry> =
-            serde_json::from_str(json).unwrap();
-
-        assert_eq!(defaults.len(), 3);
-
-        // VerticalStack: has both base and rules
-        let vs = &defaults[&DefaultLayout::VerticalStack];
-        assert!(vs.layout_options.is_some());
-        assert_eq!(vs.layout_options_rules.as_ref().unwrap().len(), 2);
-
-        // HorizontalStack: has only base
-        let hs = &defaults[&DefaultLayout::HorizontalStack];
-        assert!(hs.layout_options.is_some());
-        assert!(hs.layout_options_rules.is_none());
-
-        // Columns: has only rules
-        let cols = &defaults[&DefaultLayout::Columns];
-        assert!(cols.layout_options.is_none());
-        assert_eq!(cols.layout_options_rules.as_ref().unwrap().len(), 1);
-    }
-
-    #[test]
-    fn test_layout_default_entry_with_scrolling_and_grid() {
-        let json = r#"{
-            "layout_options": {
-                "column_ratios": [0.5],
-                "scrolling": {"columns": 3},
-                "grid": {"rows": 2}
-            },
-            "layout_options_rules": {
-                "4": {
-                    "scrolling": {"columns": 5, "center_focused_column": true}
-                }
-            }
-        }"#;
-        let entry: LayoutDefaultEntry = serde_json::from_str(json).unwrap();
-
-        let base = entry.layout_options.unwrap();
-        assert_eq!(base.scrolling.unwrap().columns, 3);
-        assert_eq!(base.grid.unwrap().rows, 2);
-
-        let rules = entry.layout_options_rules.unwrap();
-        let r4 = &rules[&4];
-        assert_eq!(r4.scrolling.unwrap().columns, 5);
-        assert_eq!(r4.scrolling.unwrap().center_focused_column, Some(true));
-        // Rule doesn't inherit base fields - full replacement
-        assert!(r4.column_ratios.is_none());
-        assert!(r4.grid.is_none());
-    }
-
-    #[test]
-    fn test_layout_default_entry_skip_serializing_none() {
-        // When both fields are None, they should not appear in output
-        let entry = LayoutDefaultEntry {
-            layout_options: None,
-            layout_options_rules: None,
-        };
-        let json = serde_json::to_string(&entry).unwrap();
-        assert!(!json.contains("layout_options"));
-        assert!(!json.contains("layout_options_rules"));
-        assert_eq!(json, "{}");
-    }
-}
-
-/// Tests for the complete-replacement cascade logic.
-///
-/// This mirrors the resolution algorithm in workspace.rs::update():
-///   - If the workspace defines EITHER layout_options OR layout_options_rules,
-///     it completely replaces the global layout_defaults for this layout.
-///   - Global defaults are only used when the workspace has NEITHER setting.
-///   - Within the effective source (workspace or global):
-///     1. Try threshold match from rules (highest matching threshold wins)
-///     2. If a rule matches -> use it (full replacement of base)
-///     3. Else -> use the base layout_options
-///
-/// Since the actual cascade is in workspace.rs (which has heavy WM dependencies),
-/// we test the pure algorithm here using the same data structures.
-mod cascade_resolution_tests {
-    use super::*;
-
-    /// Simulates the cascade resolution logic from workspace.rs::update().
-    /// This is a pure function equivalent of the inline code in update().
-    fn resolve_effective_options(
-        container_count: usize,
-        workspace_base: Option<LayoutOptions>,
-        workspace_rules: &[(usize, LayoutOptions)], // sorted by threshold ascending
-        global_base: Option<LayoutOptions>,
-        global_rules: &[(usize, LayoutOptions)], // sorted by threshold ascending
-    ) -> Option<LayoutOptions> {
-        let has_workspace_overrides = workspace_base.is_some() || !workspace_rules.is_empty();
-
-        let (effective_base, effective_rules): (Option<LayoutOptions>, &[(usize, LayoutOptions)]) =
-            if has_workspace_overrides {
-                (workspace_base, workspace_rules)
-            } else {
-                (global_base, global_rules)
-            };
-
-        // Try threshold match from effective rules
-        let mut matched = None;
-        for (threshold, opts) in effective_rules {
-            if container_count >= *threshold {
-                matched = Some(*opts);
-            }
-        }
-
-        // If a rule matched, use it (full replacement); otherwise use effective base
-        if matched.is_some() {
-            matched
-        } else {
-            effective_base
-        }
-    }
-
-    fn opts_with_ratio(ratio: f32) -> LayoutOptions {
-        layout_options_with_column_ratios(&[ratio])
-    }
-
-    // --- No overrides ---
-
-    #[test]
-    fn test_no_workspace_no_global_returns_none() {
-        let result = resolve_effective_options(3, None, &[], None, &[]);
-        assert!(result.is_none());
-    }
-
-    // --- Base-only scenarios ---
-
-    #[test]
-    fn test_workspace_base_only() {
-        let ws_base = opts_with_ratio(0.7);
-        let result = resolve_effective_options(3, Some(ws_base), &[], None, &[]);
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    #[test]
-    fn test_global_base_only() {
-        let global_base = opts_with_ratio(0.6);
-        let result = resolve_effective_options(3, None, &[], Some(global_base), &[]);
-        assert_eq!(result.unwrap().column_ratios, global_base.column_ratios);
-    }
-
-    #[test]
-    fn test_workspace_base_overrides_all_globals() {
-        // Workspace has base → globals (both base and rules) are ignored entirely
-        let ws_base = opts_with_ratio(0.7);
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(2, opts_with_ratio(0.5))];
-        let result =
-            resolve_effective_options(3, Some(ws_base), &[], Some(global_base), &global_rules);
-        // Workspace base wins; global rules are NOT used even though they would match
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    // --- Rules-only scenarios ---
-
-    #[test]
-    fn test_global_rules_match() {
-        let global_rules = vec![(2, opts_with_ratio(0.6)), (4, opts_with_ratio(0.5))];
-        // 3 containers: matches threshold 2, not 4
-        let result = resolve_effective_options(3, None, &[], None, &global_rules);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.6));
-    }
-
-    #[test]
-    fn test_global_rules_highest_matching_threshold_wins() {
-        let global_rules = vec![(2, opts_with_ratio(0.6)), (4, opts_with_ratio(0.5))];
-        // 5 containers: matches both thresholds 2 and 4; highest (4) wins
-        let result = resolve_effective_options(5, None, &[], None, &global_rules);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.5));
-    }
-
-    #[test]
-    fn test_global_rules_no_match_falls_through_to_none() {
-        let global_rules = vec![(5, opts_with_ratio(0.5))];
-        // 3 containers: doesn't match threshold 5
-        let result = resolve_effective_options(3, None, &[], None, &global_rules);
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn test_global_rules_no_match_falls_through_to_global_base() {
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(5, opts_with_ratio(0.5))];
-        // 3 containers: doesn't match threshold 5, falls back to global base
-        let result = resolve_effective_options(3, None, &[], Some(global_base), &global_rules);
-        assert_eq!(result.unwrap().column_ratios, global_base.column_ratios);
-    }
-
-    #[test]
-    fn test_workspace_rules_override_global_rules() {
-        let ws_rules = vec![(2, opts_with_ratio(0.8))];
-        let global_rules = vec![(2, opts_with_ratio(0.6))];
-        // Workspace has rules → global rules are ignored entirely
-        let result = resolve_effective_options(3, None, &ws_rules, None, &global_rules);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.8));
-    }
-
-    // --- Complete replacement: workspace having EITHER setting disables ALL globals ---
-
-    #[test]
-    fn test_workspace_rules_disable_global_base() {
-        // Workspace has rules but no base. Global has base.
-        // Since workspace has a setting, globals are completely replaced.
-        let ws_rules = vec![(2, opts_with_ratio(0.8))];
-        let global_base = opts_with_ratio(0.6);
-        // Rule matches → use it. Global base is NOT available as fallback.
-        let result = resolve_effective_options(3, None, &ws_rules, Some(global_base), &[]);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.8));
-    }
-
-    #[test]
-    fn test_workspace_rules_no_match_does_not_fall_to_global_base() {
-        // Workspace has rules (but they don't match). Global has base.
-        // Since workspace has a setting, globals are completely replaced → returns None.
-        let ws_rules = vec![(5, opts_with_ratio(0.8))];
-        let global_base = opts_with_ratio(0.6);
-        let result = resolve_effective_options(3, None, &ws_rules, Some(global_base), &[]);
-        // No workspace base, no rule match, globals ignored → None
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn test_workspace_base_disables_global_rules() {
-        // Workspace has base but no rules. Global has rules.
-        // Since workspace has a setting, globals are completely replaced.
-        let ws_base = opts_with_ratio(0.7);
-        let global_rules = vec![(2, opts_with_ratio(0.5))];
-        // No workspace rules → no rule match → use workspace base. Global rules ignored.
-        let result = resolve_effective_options(3, Some(ws_base), &[], None, &global_rules);
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    #[test]
-    fn test_workspace_base_disables_global_rules_and_base() {
-        // Workspace has base. Global has both rules and base.
-        // Since workspace has a setting, all globals are completely replaced.
-        let ws_base = opts_with_ratio(0.7);
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(2, opts_with_ratio(0.5))];
-        let result =
-            resolve_effective_options(3, Some(ws_base), &[], Some(global_base), &global_rules);
-        // Only workspace base is used; global rules and base are both ignored
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    #[test]
-    fn test_workspace_rules_disable_global_rules_and_base() {
-        // Workspace has rules. Global has both rules and base.
-        // Since workspace has a setting, all globals are completely replaced.
-        let ws_rules = vec![(2, opts_with_ratio(0.8))];
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(2, opts_with_ratio(0.5))];
-        let result =
-            resolve_effective_options(3, None, &ws_rules, Some(global_base), &global_rules);
-        // Workspace rule matches → 0.8. Global base and rules both ignored.
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.8));
-    }
-
-    // --- Full replacement semantics (rule match replaces base) ---
-
-    #[test]
-    fn test_rule_match_is_full_replacement_not_merge() {
-        // When a rule matches, its options FULLY REPLACE the base.
-        // Fields not specified in the rule default to their standard defaults.
-        let ws_base = layout_options_with_ratios(&[0.7], &[0.4]);
-        let rule_opts = layout_options_with_column_ratios(&[0.5]);
-        // rule_opts has column_ratios but no row_ratios
-        let ws_rules = vec![(2, rule_opts)];
-        let result = resolve_effective_options(3, Some(ws_base), &ws_rules, None, &[]);
-        let effective = result.unwrap();
-        // Column ratios come from the rule
-        assert_eq!(effective.column_ratios.unwrap()[0], Some(0.5));
-        // Row ratios are NOT inherited from ws_base - they're None (full replacement)
-        assert!(effective.row_ratios.is_none());
-    }
-
-    // --- Edge cases ---
-
-    #[test]
-    fn test_exact_threshold_match() {
-        let rules = vec![(3, opts_with_ratio(0.6))];
-        let result = resolve_effective_options(3, None, &rules, None, &[]);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.6));
-    }
-
-    #[test]
-    fn test_container_count_one_below_threshold() {
-        let rules = vec![(3, opts_with_ratio(0.6))];
-        let result = resolve_effective_options(2, None, &rules, None, &[]);
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn test_zero_containers() {
-        let ws_base = opts_with_ratio(0.7);
-        let rules = vec![(1, opts_with_ratio(0.5))];
-        let result = resolve_effective_options(0, Some(ws_base), &rules, None, &[]);
-        // 0 containers doesn't match threshold 1 → falls back to workspace base
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    #[test]
-    fn test_many_thresholds_correct_match() {
-        let rules = vec![
-            (1, opts_with_ratio(0.8)),
-            (3, opts_with_ratio(0.6)),
-            (5, opts_with_ratio(0.4)),
-            (8, opts_with_ratio(0.3)),
-        ];
-        // 6 containers: matches 1, 3, 5 but not 8. Highest match is 5.
-        let result = resolve_effective_options(6, None, &rules, None, &[]);
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.4));
-    }
-
-    #[test]
-    fn test_workspace_rules_disable_global_rules_even_if_ws_rules_dont_match() {
-        // Key behavior: if workspace has ANY setting, globals are entirely ignored.
-        // Even if workspace rules don't match, we don't fall back to global rules.
-        let ws_rules = vec![(10, opts_with_ratio(0.8))]; // threshold too high
-        let global_rules = vec![(2, opts_with_ratio(0.5))]; // would match
-        let result = resolve_effective_options(3, None, &ws_rules, None, &global_rules);
-        // Workspace has rules → all globals ignored. WS rules don't match → None.
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn test_all_four_sources_present_rules_match() {
-        // All four sources present: workspace base, workspace rules, global base, global rules
-        let ws_base = opts_with_ratio(0.7);
-        let ws_rules = vec![(2, opts_with_ratio(0.8))];
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(2, opts_with_ratio(0.5))];
-        let result = resolve_effective_options(
-            3,
-            Some(ws_base),
-            &ws_rules,
-            Some(global_base),
-            &global_rules,
-        );
-        // Workspace has settings → uses workspace only. Rule matches → 0.8
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.8));
-    }
-
-    #[test]
-    fn test_all_four_sources_present_rules_no_match() {
-        // All four sources present, but workspace rules don't match
-        let ws_base = opts_with_ratio(0.7);
-        let ws_rules = vec![(10, opts_with_ratio(0.8))]; // threshold too high
-        let global_base = opts_with_ratio(0.6);
-        let global_rules = vec![(10, opts_with_ratio(0.5))]; // also too high
-        let result = resolve_effective_options(
-            3,
-            Some(ws_base),
-            &ws_rules,
-            Some(global_base),
-            &global_rules,
-        );
-        // Workspace has settings → uses workspace only. No rule match → workspace base 0.7
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-
-    // --- Workspace with both base and rules ---
-
-    #[test]
-    fn test_workspace_both_rule_matches() {
-        let ws_base = opts_with_ratio(0.7);
-        let ws_rules = vec![(2, opts_with_ratio(0.5))];
-        let result = resolve_effective_options(3, Some(ws_base), &ws_rules, None, &[]);
-        // Rule matches → use rule (full replacement), not ws_base
-        assert_eq!(result.unwrap().column_ratios.unwrap()[0], Some(0.5));
-    }
-
-    #[test]
-    fn test_workspace_both_rule_no_match() {
-        let ws_base = opts_with_ratio(0.7);
-        let ws_rules = vec![(10, opts_with_ratio(0.5))];
-        let result = resolve_effective_options(3, Some(ws_base), &ws_rules, None, &[]);
-        // Rule doesn't match → fall back to ws_base
-        assert_eq!(result.unwrap().column_ratios, ws_base.column_ratios);
-    }
-}

komorebi-themes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-themes"
-version = "0.1.42"
+version = "0.1.41"
 edition = "2024"
 
 [dependencies]
@@ -15,7 +15,7 @@ serde = { workspace = true }
 serde_variant = "0.1"
 strum = { workspace = true }
 hex_color = { version = "3", features = ["serde"] }
-flavours = { git = "https://github.com/LGUG2Z/flavours", rev = "24518c129918fe3260aa559eded7657e50752cb1" }
+flavours = { git = "https://github.com/LGUG2Z/flavours", version = "0.7.2" }
 
 [features]
 default = ["schemars"]

komorebi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.42"
+version = "0.1.41"
 description = "A tiling window manager for Windows"
 repository = "https://github.com/LGUG2Z/komorebi"
 edition = "2024"

komorebi/src/animation/engine.rs

@@ -86,7 +86,6 @@ impl AnimationEngine {
                 {
                     // cancel animation
                     ANIMATION_MANAGER.lock().cancel(animation_key.as_str());
-                    render_dispatcher.cleanup_on_cancel();
                     return Ok(());
                 }
 

komorebi/src/animation/ghost.rs

@@ -1,363 +0,0 @@
-use color_eyre::eyre;
-use crossbeam_channel::Sender;
-use crossbeam_channel::bounded;
-use crossbeam_channel::unbounded;
-use std::sync::OnceLock;
-use std::time::Duration;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::LRESULT;
-use windows::Win32::Foundation::RECT;
-use windows::Win32::Foundation::WPARAM;
-use windows::Win32::Graphics::Dwm::DWM_THUMBNAIL_PROPERTIES;
-use windows::Win32::Graphics::Dwm::DWM_TNP_OPACITY;
-use windows::Win32::Graphics::Dwm::DWM_TNP_RECTDESTINATION;
-use windows::Win32::Graphics::Dwm::DWM_TNP_SOURCECLIENTAREAONLY;
-use windows::Win32::Graphics::Dwm::DWM_TNP_VISIBLE;
-use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
-use windows::Win32::UI::WindowsAndMessaging::DestroyWindow;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
-use windows::Win32::UI::WindowsAndMessaging::HWND_TOP;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::PM_REMOVE;
-use windows::Win32::UI::WindowsAndMessaging::PeekMessageW;
-use windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS;
-use windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOACTIVATE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOZORDER;
-use windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::SetWindowPos;
-use windows::Win32::UI::WindowsAndMessaging::ShowWindow;
-use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
-use windows::core::PCWSTR;
-
-use crate::WindowsApi;
-use crate::core::Rect;
-use crate::windows_api;
-
-const GHOST_CLASS_NAME: &[u16] = &[
-    b'k' as u16,
-    b'o' as u16,
-    b'm' as u16,
-    b'o' as u16,
-    b'r' as u16,
-    b'e' as u16,
-    b'b' as u16,
-    b'i' as u16,
-    b'-' as u16,
-    b'g' as u16,
-    b'h' as u16,
-    b'o' as u16,
-    b's' as u16,
-    b't' as u16,
-    0,
-];
-
-enum GhostCmd {
-    Create {
-        src_hwnd: isize,
-        start_rect: Rect,
-        z_above: Option<isize>,
-        reply: Sender<eyre::Result<(isize, isize)>>,
-    },
-    UpdateRect {
-        host_hwnd: isize,
-        hthumb: isize,
-        rect: Rect,
-    },
-    Destroy {
-        host_hwnd: isize,
-        hthumb: isize,
-    },
-}
-
-struct GhostOwner {
-    cmd_tx: Sender<GhostCmd>,
-}
-
-static GHOST_OWNER: OnceLock<GhostOwner> = OnceLock::new();
-
-fn ghost_owner() -> &'static GhostOwner {
-    GHOST_OWNER.get_or_init(|| {
-        let (tx, rx) = unbounded::<GhostCmd>();
-        std::thread::Builder::new()
-            .name("komorebi-ghost-owner".into())
-            .spawn(move || run_owner_loop(rx))
-            .expect("failed to spawn ghost owner thread");
-        GhostOwner { cmd_tx: tx }
-    })
-}
-
-/// Eagerly initialise the ghost owner thread so the first movement animation
-/// doesn't pay the spawn + class-registration cost. Idempotent. No-op for
-/// users who never enable ghost movement only if it isn't called; calling
-/// from a code path that's gated on `GHOST_MOVEMENT_ENABLED` keeps the lazy
-/// guarantee.
-pub fn prewarm() {
-    let _ = ghost_owner();
-}
-
-extern "system" fn ghost_wnd_proc(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: LPARAM) -> LRESULT {
-    unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) }
-}
-
-fn register_ghost_class() -> eyre::Result<()> {
-    let h_module = WindowsApi::module_handle_w()?;
-    let class_name = PCWSTR(GHOST_CLASS_NAME.as_ptr());
-    let window_class = WNDCLASSW {
-        hInstance: h_module.into(),
-        lpszClassName: class_name,
-        lpfnWndProc: Some(ghost_wnd_proc),
-        ..Default::default()
-    };
-    // RegisterClassW returns 0 on failure with ERROR_CLASS_ALREADY_EXISTS as a
-    // benign error if the class is already registered. We tolerate that.
-    let _ = WindowsApi::register_class_w(&window_class);
-    Ok(())
-}
-
-fn run_owner_loop(cmd_rx: crossbeam_channel::Receiver<GhostCmd>) {
-    if let Err(error) = register_ghost_class() {
-        tracing::error!("ghost owner: failed to register class: {error}");
-        return;
-    }
-
-    loop {
-        // Drain any pending Win32 messages (DWM/system messages destined for our hosts).
-        unsafe {
-            let mut msg = MSG::default();
-            while PeekMessageW(&mut msg, None, 0, 0, PM_REMOVE).as_bool() {
-                let _ = TranslateMessage(&msg);
-                DispatchMessageW(&msg);
-            }
-        }
-
-        match cmd_rx.recv_timeout(Duration::from_millis(8)) {
-            Ok(cmd) => handle_cmd(cmd),
-            Err(crossbeam_channel::RecvTimeoutError::Timeout) => continue,
-            Err(crossbeam_channel::RecvTimeoutError::Disconnected) => break,
-        }
-    }
-}
-
-fn handle_cmd(cmd: GhostCmd) {
-    match cmd {
-        GhostCmd::Create {
-            src_hwnd,
-            start_rect,
-            z_above,
-            reply,
-        } => {
-            let result = create_ghost(src_hwnd, start_rect, z_above);
-            let _ = reply.send(result);
-        }
-        GhostCmd::UpdateRect {
-            host_hwnd,
-            hthumb,
-            rect,
-        } => {
-            if let Err(error) = update_ghost(host_hwnd, hthumb, rect) {
-                tracing::trace!("ghost owner: update failed: {error}");
-            }
-        }
-        GhostCmd::Destroy { host_hwnd, hthumb } => {
-            destroy_ghost(host_hwnd, hthumb);
-        }
-    }
-}
-
-fn instance_handle() -> eyre::Result<isize> {
-    let h_module = WindowsApi::module_handle_w()?;
-    Ok(h_module.0 as isize)
-}
-
-fn create_ghost(
-    src_hwnd: isize,
-    start_rect: Rect,
-    z_above: Option<isize>,
-) -> eyre::Result<(isize, isize)> {
-    let class_name = PCWSTR(GHOST_CLASS_NAME.as_ptr());
-    let host_hwnd = WindowsApi::create_ghost_host_window(class_name, instance_handle()?)?;
-
-    // Position the host at start_rect (Rect uses left/top + width/height).
-    let z_after = match z_above {
-        Some(hwnd) => HWND(windows_api::as_ptr!(hwnd)),
-        None => HWND_TOP,
-    };
-    let flags = SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW;
-    unsafe {
-        let _ = SetWindowPos(
-            HWND(windows_api::as_ptr!(host_hwnd)),
-            Option::from(z_after),
-            start_rect.left,
-            start_rect.top,
-            start_rect.right,
-            start_rect.bottom,
-            flags,
-        );
-    }
-
-    let hthumb = match WindowsApi::dwm_register_thumbnail(host_hwnd, src_hwnd) {
-        Ok(h) => h,
-        Err(error) => {
-            unsafe {
-                let _ = DestroyWindow(HWND(windows_api::as_ptr!(host_hwnd)));
-            }
-            return Err(error);
-        }
-    };
-
-    let props = thumbnail_properties(start_rect.right, start_rect.bottom);
-    if let Err(error) = WindowsApi::dwm_update_thumbnail_properties(hthumb, &props) {
-        let _ = WindowsApi::dwm_unregister_thumbnail(hthumb);
-        unsafe {
-            let _ = DestroyWindow(HWND(windows_api::as_ptr!(host_hwnd)));
-        }
-        return Err(error);
-    }
-
-    // Make the host visible. Layered/transparent ext styles ensure no input.
-    unsafe {
-        let _ = ShowWindow(
-            HWND(windows_api::as_ptr!(host_hwnd)),
-            SHOW_WINDOW_CMD(8), // SW_SHOWNA
-        );
-    }
-
-    Ok((host_hwnd, hthumb))
-}
-
-fn update_ghost(host_hwnd: isize, hthumb: isize, rect: Rect) -> eyre::Result<()> {
-    let flags: SET_WINDOW_POS_FLAGS = SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW;
-    unsafe {
-        SetWindowPos(
-            HWND(windows_api::as_ptr!(host_hwnd)),
-            None,
-            rect.left,
-            rect.top,
-            rect.right,
-            rect.bottom,
-            flags,
-        )?;
-    }
-
-    let props = thumbnail_properties(rect.right, rect.bottom);
-    WindowsApi::dwm_update_thumbnail_properties(hthumb, &props)
-}
-
-fn destroy_ghost(host_hwnd: isize, hthumb: isize) {
-    let _ = WindowsApi::dwm_unregister_thumbnail(hthumb);
-    unsafe {
-        let _ = DestroyWindow(HWND(windows_api::as_ptr!(host_hwnd)));
-    }
-}
-
-fn thumbnail_properties(width: i32, height: i32) -> DWM_THUMBNAIL_PROPERTIES {
-    DWM_THUMBNAIL_PROPERTIES {
-        dwFlags: DWM_TNP_VISIBLE
-            | DWM_TNP_RECTDESTINATION
-            | DWM_TNP_OPACITY
-            | DWM_TNP_SOURCECLIENTAREAONLY,
-        rcDestination: RECT {
-            left: 0,
-            top: 0,
-            right: width,
-            bottom: height,
-        },
-        rcSource: RECT::default(),
-        opacity: 255,
-        fVisible: true.into(),
-        fSourceClientAreaOnly: false.into(),
-    }
-}
-
-/// A live DWM-thumbnail "ghost" of a source window, used during movement
-/// animations. While a ghost is active, the source window is typically cloaked
-/// by the caller. The ghost is automatically disposed on drop, but callers
-/// should prefer explicit `dispose()` to surface errors.
-pub struct GhostWindow {
-    host_hwnd: isize,
-    hthumb: isize,
-    disposed: bool,
-}
-
-impl GhostWindow {
-    pub fn create(src_hwnd: isize, start_rect: Rect, z_above: Option<isize>) -> eyre::Result<Self> {
-        let (reply_tx, reply_rx) = bounded::<eyre::Result<(isize, isize)>>(1);
-        ghost_owner()
-            .cmd_tx
-            .send(GhostCmd::Create {
-                src_hwnd,
-                start_rect,
-                z_above,
-                reply: reply_tx,
-            })
-            .map_err(|e| eyre::eyre!("ghost owner channel send failed: {e}"))?;
-        let (host_hwnd, hthumb) = reply_rx.recv()??;
-        Ok(Self {
-            host_hwnd,
-            hthumb,
-            disposed: false,
-        })
-    }
-
-    pub fn host_hwnd(&self) -> isize {
-        self.host_hwnd
-    }
-
-    pub fn update_rect(&self, rect: Rect) -> eyre::Result<()> {
-        ghost_owner()
-            .cmd_tx
-            .send(GhostCmd::UpdateRect {
-                host_hwnd: self.host_hwnd,
-                hthumb: self.hthumb,
-                rect,
-            })
-            .map_err(|e| eyre::eyre!("ghost owner channel send failed: {e}"))
-    }
-
-    /// Apply an opacity change directly via `DwmUpdateThumbnailProperties` on
-    /// the calling thread. Unlike rect updates (which call `SetWindowPos` and
-    /// therefore need the owner thread), opacity-only updates don't have
-    /// thread affinity, and going through the channel introduces a race where
-    /// the next `DwmFlush()` on the caller's thread can fire before the owner
-    /// has processed the SetOpacity command — which collapses what should be
-    /// a multi-frame fade into a single visible step.
-    pub fn set_opacity(&self, opacity: u8) -> eyre::Result<()> {
-        let props = DWM_THUMBNAIL_PROPERTIES {
-            dwFlags: DWM_TNP_OPACITY | DWM_TNP_VISIBLE,
-            rcDestination: RECT::default(),
-            rcSource: RECT::default(),
-            opacity,
-            fVisible: true.into(),
-            fSourceClientAreaOnly: false.into(),
-        };
-        WindowsApi::dwm_update_thumbnail_properties(self.hthumb, &props)
-    }
-
-    pub fn dispose(mut self) -> eyre::Result<()> {
-        self.dispose_inner()
-    }
-
-    fn dispose_inner(&mut self) -> eyre::Result<()> {
-        if self.disposed {
-            return Ok(());
-        }
-        self.disposed = true;
-        ghost_owner()
-            .cmd_tx
-            .send(GhostCmd::Destroy {
-                host_hwnd: self.host_hwnd,
-                hthumb: self.hthumb,
-            })
-            .map_err(|e| eyre::eyre!("ghost owner channel send failed: {e}"))
-    }
-}
-
-impl Drop for GhostWindow {
-    fn drop(&mut self) {
-        let _ = self.dispose_inner();
-    }
-}

komorebi/src/animation/mod.rs

@@ -13,7 +13,6 @@ use parking_lot::Mutex;
 pub use engine::AnimationEngine;
 pub mod animation_manager;
 pub mod engine;
-pub mod ghost;
 pub mod lerp;
 pub mod prefix;
 pub mod render_dispatcher;
@@ -60,7 +59,6 @@ pub const DEFAULT_ANIMATION_ENABLED: bool = false;
 pub const DEFAULT_ANIMATION_STYLE: AnimationStyle = AnimationStyle::Linear;
 pub const DEFAULT_ANIMATION_DURATION: u64 = 250;
 pub const DEFAULT_ANIMATION_FPS: u64 = 60;
-pub const DEFAULT_GHOST_MOVEMENT: bool = false;
 
 lazy_static! {
     pub static ref ANIMATION_MANAGER: Arc<Mutex<AnimationManager>> =
@@ -80,4 +78,3 @@ lazy_static! {
 }
 
 pub static ANIMATION_FPS: AtomicU64 = AtomicU64::new(DEFAULT_ANIMATION_FPS);
-pub static GHOST_MOVEMENT_ENABLED: AtomicBool = AtomicBool::new(DEFAULT_GHOST_MOVEMENT);

komorebi/src/animation/render_dispatcher.rs

@@ -5,10 +5,4 @@ pub trait RenderDispatcher {
     fn pre_render(&self) -> eyre::Result<()>;
     fn render(&self, delta: f64) -> eyre::Result<()>;
     fn post_render(&self) -> eyre::Result<()>;
-
-    /// Called by the animation engine when an in-flight animation is cancelled
-    /// before it could complete. Implementors should use this to release any
-    /// resources allocated in `pre_render` and bring the underlying window
-    /// back to a consistent visible state. Default: no-op.
-    fn cleanup_on_cancel(&self) {}
 }

komorebi/src/border_manager/border.rs

@@ -78,11 +78,6 @@ use windows_numerics::Matrix3x2;
 /// avoiding a data race between the border manager thread and the border's message loop thread.
 pub const WM_UPDATE_BRUSHES: u32 = WM_USER + 1;
 
-/// Custom WM_USER message used to drive the border in lockstep with an active
-/// movement animation. lparam carries a `Box<Rect>` ownership transfer that the
-/// receiving WndProc reclaims and applies as the new tracked rect.
-pub const WM_ANIMATE_RECT: u32 = WM_USER + 2;
-
 pub struct RenderFactory(ID2D1Factory);
 unsafe impl Sync for RenderFactory {}
 unsafe impl Send for RenderFactory {}
@@ -111,98 +106,6 @@ static BRUSH_PROPERTIES: LazyLock<D2D1_BRUSH_PROPERTIES> =
         transform: Matrix3x2::identity(),
     });
 
-/// Apply a new tracked rect to the border on its own message-loop thread.
-/// Updates `window_rect`, calls `set_position`, and re-renders if size/position
-/// changed. Used by both `EVENT_OBJECT_LOCATIONCHANGE` (real window movements)
-/// and `WM_ANIMATE_RECT` (animation-driven movements while the source is cloaked).
-///
-/// SAFETY: caller must ensure `border_pointer` is non-null, points to a live
-/// `Border`, and that we are running on the border's WndProc thread.
-unsafe fn apply_tracked_rect(border_pointer: *mut Border, rect: Rect) {
-    unsafe {
-        let reference_hwnd = (*border_pointer).tracking_hwnd;
-        let old_rect = (*border_pointer).window_rect;
-        (*border_pointer).window_rect = rect;
-
-        if let Err(error) = (*border_pointer).set_position(&rect, reference_hwnd) {
-            tracing::error!("failed to update border position {error}");
-        }
-
-        if (rect.is_same_size_as(&old_rect) && rect.has_same_position_as(&old_rect))
-            || (*border_pointer).render_target.is_none()
-        {
-            return;
-        }
-
-        // double-check destruction flag before rendering
-        if (*border_pointer).is_destroying.load(Ordering::Acquire) {
-            return;
-        }
-
-        let render_target = match (*border_pointer).render_target.as_ref() {
-            Some(rt) => rt,
-            None => return,
-        };
-
-        let border_width = (*border_pointer).width;
-        let border_offset = (*border_pointer).offset;
-
-        (*border_pointer).rounded_rect.rect = D2D_RECT_F {
-            left: (border_width / 2 - border_offset) as f32,
-            top: (border_width / 2 - border_offset) as f32,
-            right: (rect.right - border_width / 2 + border_offset) as f32,
-            bottom: (rect.bottom - border_width / 2 + border_offset) as f32,
-        };
-
-        let _ = render_target.Resize(&D2D_SIZE_U {
-            width: rect.right as u32,
-            height: rect.bottom as u32,
-        });
-
-        let window_kind = (*border_pointer).window_kind;
-        let Some(brush) = (*border_pointer).brushes.get(&window_kind) else {
-            return;
-        };
-
-        render_target.BeginDraw();
-        render_target.Clear(None);
-
-        let style = match (*border_pointer).style {
-            BorderStyle::System => {
-                if *WINDOWS_11 {
-                    BorderStyle::Rounded
-                } else {
-                    BorderStyle::Square
-                }
-            }
-            BorderStyle::Rounded => BorderStyle::Rounded,
-            BorderStyle::Square => BorderStyle::Square,
-        };
-
-        match style {
-            BorderStyle::Rounded => {
-                render_target.DrawRoundedRectangle(
-                    &(*border_pointer).rounded_rect,
-                    brush,
-                    border_width as f32,
-                    None,
-                );
-            }
-            BorderStyle::Square => {
-                render_target.DrawRectangle(
-                    &(*border_pointer).rounded_rect.rect,
-                    brush,
-                    border_width as f32,
-                    None,
-                );
-            }
-            _ => {}
-        }
-
-        let _ = render_target.EndDraw(None, None);
-    }
-}
-
 pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
     let hwnds = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
     let hwnd = hwnd.0 as isize;
@@ -446,29 +349,6 @@ impl Border {
         };
     }
 
-    /// Drive the border to follow `rect` during a movement animation. Hands
-    /// ownership of a boxed `Rect` to the border's message-loop thread via
-    /// `WM_ANIMATE_RECT`, which mirrors the redraw path normally driven by
-    /// `EVENT_OBJECT_LOCATIONCHANGE` on the real source window.
-    pub fn animate_to(&self, rect: Rect) {
-        let boxed = Box::new(rect);
-        let ptr = Box::into_raw(boxed);
-        let posted = unsafe {
-            PostMessageW(
-                Option::from(self.hwnd()),
-                WM_ANIMATE_RECT,
-                WPARAM(0),
-                LPARAM(ptr as isize),
-            )
-        };
-        if posted.is_err() {
-            // Reclaim the box on failure to avoid leaking.
-            unsafe {
-                drop(Box::from_raw(ptr));
-            }
-        }
-    }
-
     pub fn set_position(&self, rect: &Rect, reference_hwnd: isize) -> color_eyre::Result<()> {
         let mut rect = *rect;
         rect.add_margin(self.width);
@@ -539,24 +419,81 @@ impl Border {
                     }
 
                     let reference_hwnd = (*border_pointer).tracking_hwnd;
+
+                    let old_rect = (*border_pointer).window_rect;
                     let rect = WindowsApi::window_rect(reference_hwnd).unwrap_or_default();
-                    apply_tracked_rect(border_pointer, rect);
-                    LRESULT(0)
-                }
-                WM_ANIMATE_RECT => {
-                    // lparam carries an owned Box<Rect> from the animation thread.
-                    let rect_box = Box::from_raw(lparam.0 as *mut Rect);
-                    let border_pointer: *mut Border = GetWindowLongPtrW(window, GWLP_USERDATA) as _;
 
-                    if border_pointer.is_null() {
+                    (*border_pointer).window_rect = rect;
-                        return LRESULT(0);
+
+                    if let Err(error) = (*border_pointer).set_position(&rect, reference_hwnd) {
+                        tracing::error!("failed to update border position {error}");
                     }
 
+                    if (!rect.is_same_size_as(&old_rect) || !rect.has_same_position_as(&old_rect))
+                        && let Some(render_target) = (*border_pointer).render_target.as_ref()
+                    {
+                        // double-check destruction flag before rendering
                         if (*border_pointer).is_destroying.load(Ordering::Acquire) {
                             return LRESULT(0);
                         }
 
-                    apply_tracked_rect(border_pointer, *rect_box);
+                        let border_width = (*border_pointer).width;
+                        let border_offset = (*border_pointer).offset;
+
+                        (*border_pointer).rounded_rect.rect = D2D_RECT_F {
+                            left: (border_width / 2 - border_offset) as f32,
+                            top: (border_width / 2 - border_offset) as f32,
+                            right: (rect.right - border_width / 2 + border_offset) as f32,
+                            bottom: (rect.bottom - border_width / 2 + border_offset) as f32,
+                        };
+
+                        let _ = render_target.Resize(&D2D_SIZE_U {
+                            width: rect.right as u32,
+                            height: rect.bottom as u32,
+                        });
+
+                        let window_kind = (*border_pointer).window_kind;
+                        if let Some(brush) = (*border_pointer).brushes.get(&window_kind) {
+                            render_target.BeginDraw();
+                            render_target.Clear(None);
+
+                            // Calculate border radius based on style
+                            let style = match (*border_pointer).style {
+                                BorderStyle::System => {
+                                    if *WINDOWS_11 {
+                                        BorderStyle::Rounded
+                                    } else {
+                                        BorderStyle::Square
+                                    }
+                                }
+                                BorderStyle::Rounded => BorderStyle::Rounded,
+                                BorderStyle::Square => BorderStyle::Square,
+                            };
+
+                            match style {
+                                BorderStyle::Rounded => {
+                                    render_target.DrawRoundedRectangle(
+                                        &(*border_pointer).rounded_rect,
+                                        brush,
+                                        border_width as f32,
+                                        None,
+                                    );
+                                }
+                                BorderStyle::Square => {
+                                    render_target.DrawRectangle(
+                                        &(*border_pointer).rounded_rect.rect,
+                                        brush,
+                                        border_width as f32,
+                                        None,
+                                    );
+                                }
+                                _ => {}
+                            }
+
+                            let _ = render_target.EndDraw(None, None);
+                        }
+                    }
+
                     LRESULT(0)
                 }
                 WM_PAINT => {

komorebi/src/border_manager/mod.rs

@@ -113,20 +113,6 @@ pub fn window_border(hwnd: isize) -> Option<BorderInfo> {
     })
 }
 
-/// Drive the border that tracks `source_hwnd` to follow `rect`. No-op when no
-/// border is registered for the source window. Used by movement animations to
-/// keep the border visually in sync while the source window is cloaked.
-pub fn animate_to(source_hwnd: isize, rect: crate::core::Rect) {
-    let border_id = match WINDOWS_BORDERS.lock().get(&source_hwnd).cloned() {
-        Some(id) => id,
-        None => return,
-    };
-    let state = BORDER_STATE.lock();
-    if let Some(border) = state.get(&border_id) {
-        border.animate_to(rect);
-    }
-}
-
 pub fn send_notification(hwnd: Option<isize>) {
     if event_tx().try_send(Notification::Update(hwnd)).is_err() {
         tracing::warn!("channel is full; dropping notification")

komorebi/src/core/mod.rs

@@ -32,7 +32,6 @@ pub use komorebi_layouts::DefaultLayout;
 pub use komorebi_layouts::Direction;
 pub use komorebi_layouts::GridLayoutOptions;
 pub use komorebi_layouts::Layout;
-pub use komorebi_layouts::LayoutDefaultEntry;
 pub use komorebi_layouts::LayoutOptions;
 pub use komorebi_layouts::MAX_RATIO;
 pub use komorebi_layouts::MAX_RATIOS;
@@ -113,8 +112,6 @@ pub enum SocketMessage {
     WindowHidingBehaviour(HidingBehaviour),
     ToggleCrossMonitorMoveBehaviour,
     CrossMonitorMoveBehaviour(MoveBehaviour),
-    ToggleMonocleFocusBehaviour,
-    MonocleFocusBehaviour(MonocleFocusBehaviour),
     UnmanagedWindowOperationBehaviour(OperationBehaviour),
     // Current Workspace Commands
     ManageFocusedWindow,
@@ -532,19 +529,6 @@ pub enum CrossBoundaryBehaviour {
     Monitor,
 }
 
-#[derive(
-    Clone, Copy, Debug, Default, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq,
-)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-/// Behaviour when focusing in a direction while a monocle container is active
-pub enum MonocleFocusBehaviour {
-    /// Cycle the monocle container to the next/previous container in the workspace
-    Cycle,
-    /// Do nothing, allowing focus to fall through to cross-monitor logic
-    #[default]
-    NoOp,
-}
-
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 /// Window hiding behaviour

komorebi/src/lib.rs

@@ -238,9 +238,6 @@ lazy_static! {
     static ref FLOATING_WINDOW_TOGGLE_ASPECT_RATIO: Arc<Mutex<AspectRatio>> = Arc::new(Mutex::new(AspectRatio::Predefined(PredefinedAspectRatio::Widescreen)));
 
     static ref CURRENT_VIRTUAL_DESKTOP: Arc<Mutex<Option<Vec<u8>>>> = Arc::new(Mutex::new(None));
-
-    pub static ref LAYOUT_DEFAULTS: Arc<Mutex<HashMap<DefaultLayout, LayoutDefaultEntry>>> =
-        Arc::new(Mutex::new(HashMap::new()));
 }
 
 pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);

komorebi/src/monitor.rs

@@ -307,10 +307,12 @@ impl Monitor {
                         DefaultLayout::RightMainVerticalStack => {
                             workspace.add_container_to_front(container);
                         }
-                        DefaultLayout::UltrawideVerticalStack
+                        DefaultLayout::UltrawideVerticalStack => {
-                            if workspace.containers().len() == 1 =>
+                            if workspace.containers().len() == 1 {
-                        {
                                 workspace.insert_container_at_idx(0, container);
+                            } else {
+                                workspace.add_container_to_back(container);
+                            }
                         }
                         _ => {
                             workspace.add_container_to_back(container);
@@ -330,10 +332,12 @@ impl Monitor {
 
                         match layout {
                             DefaultLayout::RightMainVerticalStack
-                            | DefaultLayout::UltrawideVerticalStack
+                            | DefaultLayout::UltrawideVerticalStack => {
-                                if workspace.containers().len() == 1 =>
+                                if workspace.containers().len() == 1 {
-                            {
                                     workspace.add_container_to_back(container);
+                                } else {
+                                    workspace.insert_container_at_idx(target_index, container);
+                                }
                             }
                             _ => {
                                 workspace.insert_container_at_idx(target_index, container);

komorebi/src/process_command.rs

@@ -61,7 +61,6 @@ use crate::core::BorderImplementation;
 use crate::core::FocusFollowsMouseImplementation;
 use crate::core::Layout;
 use crate::core::LayoutOptions;
-use crate::core::MonocleFocusBehaviour;
 use crate::core::MoveBehaviour;
 use crate::core::OperationDirection;
 use crate::core::Rect;
@@ -2069,15 +2068,6 @@ if (!(Get-Process komorebi-bar -ErrorAction SilentlyContinue))
             SocketMessage::CrossMonitorMoveBehaviour(behaviour) => {
                 self.cross_monitor_move_behaviour = behaviour;
             }
-            SocketMessage::ToggleMonocleFocusBehaviour => {
-                self.monocle_focus_behaviour = match self.monocle_focus_behaviour {
-                    MonocleFocusBehaviour::Cycle => MonocleFocusBehaviour::NoOp,
-                    MonocleFocusBehaviour::NoOp => MonocleFocusBehaviour::Cycle,
-                };
-            }
-            SocketMessage::MonocleFocusBehaviour(behaviour) => {
-                self.monocle_focus_behaviour = behaviour;
-            }
             SocketMessage::UnmanagedWindowOperationBehaviour(behaviour) => {
                 self.unmanaged_window_operation_behaviour = behaviour;
             }

komorebi/src/process_movement.rs

@@ -28,12 +28,14 @@ pub fn listen_for_movements(wm: Arc<Mutex<WindowManager>>) {
                         Action::Press => ignore_movement = true,
                         Action::Release => ignore_movement = false,
                     },
-                    Event::MouseMoveRelative { .. } if !ignore_movement => {
+                    Event::MouseMoveRelative { .. } => {
+                        if !ignore_movement {
                             match wm.lock().raise_window_at_cursor_pos() {
                                 Ok(()) => {}
                                 Err(error) => tracing::error!("{}", error),
                             }
                         }
+                    }
                     _ => {}
                 }
             }

komorebi/src/state.rs

@@ -13,7 +13,6 @@ use crate::IGNORE_IDENTIFIERS;
 use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
 use crate::MONITOR_INDEX_PREFERENCES;
-use crate::MonocleFocusBehaviour;
 use crate::MoveBehaviour;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::OperationBehaviour;
@@ -62,7 +61,6 @@ pub struct State {
     pub new_window_behaviour: WindowContainerBehaviour,
     pub float_override: bool,
     pub cross_monitor_move_behaviour: MoveBehaviour,
-    pub monocle_focus_behaviour: MonocleFocusBehaviour,
     pub unmanaged_window_operation_behaviour: OperationBehaviour,
     pub work_area_offset: Option<Rect>,
     pub focus_follows_mouse: Option<FocusFollowsMouseImplementation>,
@@ -95,10 +93,6 @@ impl State {
             return true;
         }
 
-        if self.monocle_focus_behaviour != new.monocle_focus_behaviour {
-            return true;
-        }
-
         if self.unmanaged_window_operation_behaviour != new.unmanaged_window_operation_behaviour {
             return true;
         }
@@ -259,8 +253,6 @@ impl From<&WindowManager> for State {
                             layout: workspace.layout.clone(),
                             layout_options: workspace.layout_options,
                             layout_rules: workspace.layout_rules.clone(),
-                            layout_options_rules: workspace.layout_options_rules.clone(),
-                            layout_defaults_cache: workspace.layout_defaults_cache.clone(),
                             work_area_offset_rules: workspace.work_area_offset_rules.clone(),
                             layout_flip: workspace.layout_flip,
                             workspace_padding: workspace.workspace_padding,
@@ -307,7 +299,6 @@ impl From<&WindowManager> for State {
             new_window_behaviour: wm.window_management_behaviour.current_behaviour,
             float_override: wm.window_management_behaviour.float_override,
             cross_monitor_move_behaviour: wm.cross_monitor_move_behaviour,
-            monocle_focus_behaviour: wm.monocle_focus_behaviour,
             focus_follows_mouse: wm.focus_follows_mouse,
             mouse_follows_focus: wm.mouse_follows_focus,
             has_pending_raise_op: wm.has_pending_raise_op,

komorebi/src/static_config.rs

@@ -13,7 +13,6 @@ use crate::FloatingLayerBehaviour;
 use crate::HIDING_BEHAVIOUR;
 use crate::IGNORE_IDENTIFIERS;
 use crate::LAYERED_WHITELIST;
-use crate::LAYOUT_DEFAULTS;
 use crate::MANAGE_IDENTIFIERS;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
@@ -39,8 +38,6 @@ use crate::animation::ANIMATION_FPS;
 use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
 use crate::animation::DEFAULT_ANIMATION_FPS;
-use crate::animation::DEFAULT_GHOST_MOVEMENT;
-use crate::animation::GHOST_MOVEMENT_ENABLED;
 use crate::animation::PerAnimationPrefixConfig;
 use crate::asc::ApplicationSpecificConfiguration;
 use crate::asc::AscApplicationRulesOrSchema;
@@ -56,9 +53,7 @@ use crate::core::DefaultLayout;
 use crate::core::FocusFollowsMouseImplementation;
 use crate::core::HidingBehaviour;
 use crate::core::Layout;
-use crate::core::LayoutDefaultEntry;
 use crate::core::LayoutOptions;
-use crate::core::MonocleFocusBehaviour;
 use crate::core::MoveBehaviour;
 use crate::core::OperationBehaviour;
 use crate::core::Rect;
@@ -220,12 +215,6 @@ pub struct WorkspaceConfig {
     /// Layout-specific options
     #[serde(skip_serializing_if = "Option::is_none")]
     pub layout_options: Option<LayoutOptions>,
-    /// Threshold-based layout options rules in the format of threshold => options.
-    /// When container count >= threshold, the highest matching threshold's options
-    /// fully replace the base `layout_options`.
-    /// This follows the same threshold logic as `layout_rules`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout_options_rules: Option<HashMap<usize, LayoutOptions>>,
     /// END OF LIFE FEATURE: Custom Layout
     #[deprecated(note = "End of life feature")]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -353,11 +342,6 @@ impl From<&Workspace> for WorkspaceConfig {
                 );
                 value.layout_options
             },
-            layout_options_rules: if value.layout_options_rules.is_empty() {
-                None
-            } else {
-                Some(value.layout_options_rules.iter().copied().collect())
-            },
             #[allow(deprecated)]
             custom_layout: value
                 .workspace_config
@@ -478,7 +462,7 @@ pub enum AppSpecificConfigurationPath {
 #[serde_with::serde_as]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-/// The `komorebi.json` static configuration file reference for `v0.1.42`
+/// The `komorebi.json` static configuration file reference for `v0.1.41`
 pub struct StaticConfig {
     /// DEPRECATED from v0.1.22: no longer required
     #[deprecated(note = "No longer required")]
@@ -530,10 +514,6 @@ pub struct StaticConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[cfg_attr(feature = "schemars", schemars(extend("default" = CrossBoundaryBehaviour::Monitor)))]
     pub cross_boundary_behaviour: Option<CrossBoundaryBehaviour>,
-    /// Determine what happens when focusing in a direction while a monocle container is active
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg_attr(feature = "schemars", schemars(extend("default" = MonocleFocusBehaviour::NoOp)))]
-    pub monocle_focus_behaviour: Option<MonocleFocusBehaviour>,
     /// Determine what happens when commands are sent while an unmanaged window is in the foreground
     #[serde(skip_serializing_if = "Option::is_none")]
     #[cfg_attr(feature = "schemars", schemars(extend("default" = OperationBehaviour::Op)))]
@@ -602,11 +582,6 @@ pub struct StaticConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[cfg_attr(feature = "schemars", schemars(extend("default" = DEFAULT_CONTAINER_PADDING)))]
     pub default_container_padding: Option<i32>,
-    /// Per-layout default options and rules, keyed by layout name.
-    /// Applied as fallback when a workspace does not define its own layout_options or layout_options_rules.
-    /// If a workspace defines either setting, all global defaults for that layout are completely replaced.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout_defaults: Option<HashMap<DefaultLayout, LayoutDefaultEntry>>,
     /// Monitor and workspace configurations
     #[serde(skip_serializing_if = "Option::is_none")]
     pub monitors: Option<Vec<MonitorConfig>>,
@@ -702,11 +677,6 @@ pub struct AnimationsConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[cfg_attr(feature = "schemars", schemars(extend("default" = ANIMATION_FPS)))]
     pub fps: Option<u64>,
-    /// Render movement animations on a GPU-composited ghost surface (recommended).
-    /// When false, falls back to the legacy per-frame MoveWindow path.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg_attr(feature = "schemars", schemars(extend("default" = false)))]
-    pub ghost_movement: Option<bool>,
 }
 
 pub use komorebi_themes::KomorebiTheme;
@@ -891,7 +861,6 @@ impl From<&WindowManager> for StaticConfig {
             ),
             cross_monitor_move_behaviour: Option::from(value.cross_monitor_move_behaviour),
             cross_boundary_behaviour: Option::from(value.cross_boundary_behaviour),
-            monocle_focus_behaviour: Option::from(value.monocle_focus_behaviour),
             unmanaged_window_operation_behaviour: Option::from(
                 value.unmanaged_window_operation_behaviour,
             ),
@@ -922,14 +891,6 @@ impl From<&WindowManager> for StaticConfig {
             default_container_padding: Option::from(
                 DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst),
             ),
-            layout_defaults: {
-                let guard = LAYOUT_DEFAULTS.lock();
-                if guard.is_empty() {
-                    None
-                } else {
-                    Some(guard.clone())
-                }
-            },
             monitors: Option::from(monitors),
             window_hiding_behaviour: Option::from(*HIDING_BEHAVIOUR.lock()),
             global_work_area_offset: value.work_area_offset,
@@ -1035,17 +996,6 @@ impl StaticConfig {
                 animations.fps.unwrap_or(DEFAULT_ANIMATION_FPS),
                 Ordering::SeqCst,
             );
-
-            let ghost_movement_enabled =
-                animations.ghost_movement.unwrap_or(DEFAULT_GHOST_MOVEMENT);
-            GHOST_MOVEMENT_ENABLED.store(ghost_movement_enabled, Ordering::SeqCst);
-            if ghost_movement_enabled {
-                // Spawn the ghost owner thread now so the first animation
-                // doesn't pay the spawn + wndclass-registration cost. Lazy
-                // guarantee preserved: users who turn ghost_movement off
-                // never trigger this path, so the thread is never created.
-                crate::animation::ghost::prewarm();
-            }
         }
 
         if let Some(container) = self.default_container_padding {
@@ -1056,12 +1006,6 @@ impl StaticConfig {
             DEFAULT_WORKSPACE_PADDING.store(workspace, Ordering::SeqCst);
         }
 
-        if let Some(defaults) = &self.layout_defaults {
-            *LAYOUT_DEFAULTS.lock() = defaults.clone();
-        } else {
-            LAYOUT_DEFAULTS.lock().clear();
-        }
-
         if let Some(border_width) = self.border_width {
             border_manager::BORDER_WIDTH.store(border_width, Ordering::SeqCst);
         }
@@ -1354,7 +1298,6 @@ impl StaticConfig {
             cross_boundary_behaviour: value
                 .cross_boundary_behaviour
                 .unwrap_or(CrossBoundaryBehaviour::Monitor),
-            monocle_focus_behaviour: value.monocle_focus_behaviour.unwrap_or_default(),
             unmanaged_window_operation_behaviour: value
                 .unmanaged_window_operation_behaviour
                 .unwrap_or(OperationBehaviour::Op),
@@ -1471,7 +1414,7 @@ impl StaticConfig {
                             workspace_config.layout = Some(DefaultLayout::Columns);
                         }
 
-                        ws.load_static_config(workspace_config, value.layout_defaults.as_ref())?;
+                        ws.load_static_config(workspace_config)?;
                     }
                 }
 
@@ -1554,10 +1497,7 @@ impl StaticConfig {
 
                     for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
                         if let Some(workspace_config) = monitor_config.workspaces.get(j) {
-                            ws.load_static_config(
+                            ws.load_static_config(workspace_config)?;
-                                workspace_config,
-                                value.layout_defaults.as_ref(),
-                            )?;
                         }
                     }
 
@@ -1639,7 +1579,7 @@ impl StaticConfig {
 
                 for (j, ws) in monitor.workspaces_mut().iter_mut().enumerate() {
                     if let Some(workspace_config) = monitor_config.workspaces.get(j) {
-                        ws.load_static_config(workspace_config, value.layout_defaults.as_ref())?;
+                        ws.load_static_config(workspace_config)?;
                     }
                 }
 
@@ -1722,10 +1662,7 @@ impl StaticConfig {
 
                     for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
                         if let Some(workspace_config) = monitor_config.workspaces.get(j) {
-                            ws.load_static_config(
+                            ws.load_static_config(workspace_config)?;
-                                workspace_config,
-                                value.layout_defaults.as_ref(),
-                            )?;
                         }
                     }
 
@@ -1756,7 +1693,6 @@ impl StaticConfig {
             value.float_rule_placement.unwrap_or(Placement::None);
         wm.cross_monitor_move_behaviour = value.cross_monitor_move_behaviour.unwrap_or_default();
         wm.cross_boundary_behaviour = value.cross_boundary_behaviour.unwrap_or_default();
-        wm.monocle_focus_behaviour = value.monocle_focus_behaviour.unwrap_or_default();
         wm.unmanaged_window_operation_behaviour = value
             .unmanaged_window_operation_behaviour
             .unwrap_or_default();

komorebi/src/window.rs

@@ -20,9 +20,7 @@ use crate::animation::ANIMATION_MANAGER;
 use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
 use crate::animation::AnimationEngine;
-use crate::animation::GHOST_MOVEMENT_ENABLED;
 use crate::animation::RenderDispatcher;
-use crate::animation::ghost::GhostWindow;
 use crate::animation::lerp::Lerp;
 use crate::animation::prefix::AnimationPrefix;
 use crate::animation::prefix::new_animation_key;
@@ -44,7 +42,6 @@ use crate::windows_api;
 use crate::windows_api::WindowsApi;
 use color_eyre::eyre;
 use crossbeam_utils::atomic::AtomicConsume;
-use parking_lot::Mutex;
 use regex::Regex;
 use serde::Deserialize;
 use serde::Serialize;
@@ -55,7 +52,6 @@ use std::convert::TryFrom;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::fmt::Write as _;
-use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::Ordering;
 use std::thread;
@@ -169,18 +165,6 @@ struct MovementRenderDispatcher {
     target_rect: Rect,
     top: bool,
     style: AnimationStyle,
-    /// Some between successful pre_render and post_render/cleanup_on_cancel when
-    /// ghost movement is active. None for the legacy code path.
-    ghost: Mutex<Option<GhostWindow>>,
-    /// Tracks whether the source has been cloaked so cleanup can uncloak idempotently.
-    cloaked: AtomicBool,
-    /// Last lerped logical rect actually applied; used by cleanup_on_cancel to
-    /// snap the real window to the position the user was last seeing.
-    last_animated_rect: Mutex<Rect>,
-    /// True when pre_render successfully repositioned the source to target_rect
-    /// before registering the thumbnail. In that case post_render must skip
-    /// the final position_window since the source is already there.
-    pre_painted: AtomicBool,
 }
 
 impl MovementRenderDispatcher {
@@ -199,33 +183,37 @@ impl MovementRenderDispatcher {
             target_rect,
             top,
             style,
-            ghost: Mutex::new(None),
+        }
-            cloaked: AtomicBool::new(false),
-            last_animated_rect: Mutex::new(start_rect),
-            pre_painted: AtomicBool::new(false),
     }
 }
 
-    fn use_ghost(&self) -> bool {
+impl RenderDispatcher for MovementRenderDispatcher {
-        GHOST_MOVEMENT_ENABLED.load(Ordering::Relaxed)
+    fn get_animation_key(&self) -> String {
+        new_animation_key(MovementRenderDispatcher::PREFIX, self.hwnd.to_string())
     }
 
-    /// Chromium / Electron windows expose a top-level class beginning with
+    fn pre_render(&self) -> eyre::Result<()> {
-    /// `Chrome_WidgetWin_`. Their renderer pipeline is suspended whenever
+        stackbar_manager::STACKBAR_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
-    /// `NativeWindowOcclusionTrackerWin` reads any non-zero `DWMWA_CLOAKED`
+        stackbar_manager::send_notification();
-    /// state on the HWND, so the pre-paint trick (cloak → SetWindowPos →
+
-    /// capture) leaves the DComp swap chain stale and the post-uncloak frame
+        Ok(())
-    /// shows half-painted / black regions. For these apps we fall back to
-    /// capture-at-start: keep the source cloaked at start_rect for the whole
-    /// animation and only move it to target in post_render, where the
-    /// uncloak is the visibility flip that wakes Viz back up.
-    fn source_is_chromium_shell(&self) -> bool {
-        WindowsApi::real_window_class_w(self.hwnd)
-            .map(|class| class.starts_with("Chrome_WidgetWin_"))
-            .unwrap_or(false)
     }
 
-    fn finalise_managers(&self) {
+    fn render(&self, progress: f64) -> eyre::Result<()> {
+        let new_rect = self.start_rect.lerp(self.target_rect, progress, self.style);
+
+        // we don't check WINDOW_HANDLING_BEHAVIOUR here because animations
+        // are always run on a separate thread
+        WindowsApi::move_window(self.hwnd, &new_rect, false)?;
+        WindowsApi::invalidate_rect(self.hwnd, None, false);
+
+        Ok(())
+    }
+
+    fn post_render(&self) -> eyre::Result<()> {
+        // we don't add the async_window_pos flag here because animations
+        // are always run on a separate thread
+        WindowsApi::position_window(self.hwnd, &self.target_rect, self.top, false)?;
         if ANIMATION_MANAGER
             .lock()
             .count_in_progress(MovementRenderDispatcher::PREFIX)
@@ -240,202 +228,9 @@ impl MovementRenderDispatcher {
             stackbar_manager::send_notification();
             transparency_manager::send_notification();
         }
-    }
-}
-
-impl RenderDispatcher for MovementRenderDispatcher {
-    fn get_animation_key(&self) -> String {
-        new_animation_key(MovementRenderDispatcher::PREFIX, self.hwnd.to_string())
-    }
-
-    fn pre_render(&self) -> eyre::Result<()> {
-        stackbar_manager::STACKBAR_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
-        stackbar_manager::send_notification();
-
-        if self.use_ghost() {
-            let is_chromium = self.source_is_chromium_shell();
-
-            // The ghost host is sized to the LOGICAL rect (visible content
-            // area). DWM thumbnails capture the source at its
-            // DWMWA_EXTENDED_FRAME_BOUNDS extents (visible content), not
-            // GetWindowRect outer extents that include the drop-shadow
-            // margin. Sizing the host to outer dims would stretch the
-            // visible-content texture by the shadow ratio.
-            //
-            // Place the ghost in z-order immediately above the source so
-            // multiple simultaneously animating windows (workspace switches,
-            // layout flips) keep the same relative stacking as their
-            // sources rather than all piling up at HWND_TOP in creation
-            // order.
-            //
-            // For non-Chromium sources we ALSO pre-position the source to
-            // target_rect *before* registering the thumbnail, so the
-            // captured pixels reflect target-dimensioned content. The ghost
-            // dest then animates start → target with the texture
-            // downscaling to native 1:1 at the end — crisp final frame
-            // instead of an upscaled blur. For Chromium we skip pre-paint
-            // (see `source_is_chromium_shell`).
-            //
-            // DwmSetWindowAttribute(DWMWA_CLOAK) is rejected with
-            // E_ACCESSDENIED for foreign HWNDs; the undocumented
-            // IApplicationView::SetCloak path used elsewhere does not have
-            // that restriction.
-            SetCloak(Window { hwnd: self.hwnd }.hwnd(), 1, 2);
-            self.cloaked.store(true, Ordering::SeqCst);
-
-            if !is_chromium {
-                if let Err(error) =
-                    WindowsApi::position_window(self.hwnd, &self.target_rect, self.top, false)
-                {
-                    tracing::warn!(
-                        "ghost movement: failed to pre-position hwnd {}: {error}",
-                        self.hwnd
-                    );
-                } else {
-                    // No DwmFlush here. DWM thumbnails are live: once
-                    // registered, the thumbnail surface updates as the
-                    // source paints, so the texture catches up to
-                    // target-dim content within the first frame or two of
-                    // the animation. Skipping the flush avoids a ~16ms
-                    // pre-render stall on every non-Chromium animation.
-                    self.pre_painted.store(true, Ordering::SeqCst);
-                }
-            }
-
-            match GhostWindow::create(self.hwnd, self.start_rect, Some(self.hwnd)) {
-                Ok(ghost) => {
-                    *self.ghost.lock() = Some(ghost);
-                }
-                Err(error) => {
-                    tracing::warn!(
-                        "ghost movement: failed to create ghost for hwnd {}: {error}; \
-                         uncloaking and falling back to legacy path",
-                        self.hwnd
-                    );
-                    SetCloak(Window { hwnd: self.hwnd }.hwnd(), 1, 0);
-                    self.cloaked.store(false, Ordering::SeqCst);
-                }
-            }
-        }
 
         Ok(())
     }
-
-    fn render(&self, progress: f64) -> eyre::Result<()> {
-        let logical = self.start_rect.lerp(self.target_rect, progress, self.style);
-        *self.last_animated_rect.lock() = logical;
-
-        let ghost_active = self.ghost.lock().is_some();
-        if ghost_active {
-            if let Some(ghost) = self.ghost.lock().as_ref()
-                && let Err(error) = ghost.update_rect(logical)
-            {
-                tracing::trace!("ghost update_rect failed: {error}");
-            }
-            border_manager::animate_to(self.hwnd, logical);
-        } else {
-            // Legacy path: animations always run on a separate thread, so we don't
-            // gate on WINDOW_HANDLING_BEHAVIOUR here.
-            WindowsApi::move_window(self.hwnd, &logical, false)?;
-            WindowsApi::invalidate_rect(self.hwnd, None, false);
-        }
-
-        Ok(())
-    }
-
-    fn post_render(&self) -> eyre::Result<()> {
-        let used_ghost = self.ghost.lock().is_some();
-        let pre_painted = self.pre_painted.load(Ordering::SeqCst);
-
-        // Final single SetWindowPos. For the pre-paint ghost path the source
-        // has already been moved to target_rect in pre_render and we skip
-        // this. For the Chromium ghost path (no pre-paint) the source is
-        // still cloaked at start_rect and needs to be moved here. For the
-        // legacy non-ghost path this is the original final reposition.
-        if !pre_painted {
-            WindowsApi::position_window(self.hwnd, &self.target_rect, self.top, false)?;
-        }
-
-        // Uncloak BEFORE crossfade so the real window's first post-resize
-        // frame is being composed underneath the still-visible ghost while
-        // we fade. This gives Chromium/Electron renderers time to produce a
-        // CompositorFrame at the new size — the visibility flip from
-        // cloaked-to-uncloaked is what nudges Viz to resume frame
-        // production.
-        if self.cloaked.swap(false, Ordering::SeqCst) {
-            SetCloak(Window { hwnd: self.hwnd }.hwnd(), 1, 0);
-        }
-
-        if used_ghost {
-            // Crossfade the ghost out over several DWM frames. This masks the
-            // texture mismatch (start-dim bitmap stretched vs. crisp
-            // target-dim repaint) and gives slow-to-repaint apps time to
-            // present their first post-resize frame before the overlay is
-            // removed. Mirrors KWin's geometry-effect crossfade.
-            //
-            // Ease-in curve (1 - t^3): opacity holds high for most of the
-            // fade and only drops sharply at the end. The ghost stays
-            // prominent while the real window's first few frames land
-            // underneath, so the user perceives a smooth reveal rather than
-            // a snap.
-            //
-            // We call set_opacity directly (synchronous DwmUpdateThumbnailProperties
-            // on this thread) rather than via the ghost owner channel, so
-            // each step is guaranteed to be visible before the following
-            // DwmFlush waits for the next vblank.
-            if let Some(ghost) = self.ghost.lock().as_ref() {
-                const FADE_STEPS: u32 = 8;
-                for step in 1..=FADE_STEPS {
-                    let t = step as f32 / FADE_STEPS as f32;
-                    let progress = t * t * t;
-                    #[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
-                    let opacity_u8 = ((1.0 - progress) * 255.0).round().clamp(0.0, 255.0) as u8;
-                    let _ = ghost.set_opacity(opacity_u8);
-                    unsafe {
-                        let _ = windows::Win32::Graphics::Dwm::DwmFlush();
-                    }
-                }
-            }
-        } else {
-            // Legacy path: still benefit from one DWM frame's wait so the
-            // app's first post-move paint lands.
-            unsafe {
-                let _ = windows::Win32::Graphics::Dwm::DwmFlush();
-            }
-        }
-
-        if let Some(ghost) = self.ghost.lock().take() {
-            let _ = ghost.dispose();
-        }
-
-        self.finalise_managers();
-
-        Ok(())
-    }
-
-    fn cleanup_on_cancel(&self) {
-        // Snap the real window to wherever the ghost was last drawn so the next
-        // dispatcher can capture an accurate start_rect. Then uncloak and tear
-        // down the ghost. Mirrors post_render but uses last_animated_rect.
-        let target = *self.last_animated_rect.lock();
-
-        if let Err(error) = WindowsApi::position_window(self.hwnd, &target, false, false) {
-            tracing::warn!(
-                "ghost movement cancel: failed to snap hwnd {} to last rect: {error}",
-                self.hwnd
-            );
-        }
-
-        if self.cloaked.swap(false, Ordering::SeqCst) {
-            SetCloak(Window { hwnd: self.hwnd }.hwnd(), 1, 0);
-        }
-
-        if let Some(ghost) = self.ghost.lock().take() {
-            let _ = ghost.dispose();
-        }
-
-        self.finalise_managers();
-    }
 }
 
 struct TransparencyRenderDispatcher {

komorebi/src/window_manager.rs

@@ -33,7 +33,6 @@ use crate::core::CycleDirection;
 use crate::core::DefaultLayout;
 use crate::core::FocusFollowsMouseImplementation;
 use crate::core::Layout;
-use crate::core::MonocleFocusBehaviour;
 use crate::core::MoveBehaviour;
 use crate::core::OperationBehaviour;
 use crate::core::OperationDirection;
@@ -82,7 +81,6 @@ pub struct WindowManager {
     pub window_management_behaviour: WindowManagementBehaviour,
     pub cross_monitor_move_behaviour: MoveBehaviour,
     pub cross_boundary_behaviour: CrossBoundaryBehaviour,
-    pub monocle_focus_behaviour: MonocleFocusBehaviour,
     pub unmanaged_window_operation_behaviour: OperationBehaviour,
     pub focus_follows_mouse: Option<FocusFollowsMouseImplementation>,
     pub mouse_follows_focus: bool,
@@ -160,7 +158,6 @@ impl WindowManager {
             window_management_behaviour: WindowManagementBehaviour::default(),
             cross_monitor_move_behaviour: MoveBehaviour::Swap,
             cross_boundary_behaviour: CrossBoundaryBehaviour::Monitor,
-            monocle_focus_behaviour: MonocleFocusBehaviour::default(),
             unmanaged_window_operation_behaviour: OperationBehaviour::Op,
             resize_delta: 50,
             focus_follows_mouse: None,
@@ -2113,9 +2110,7 @@ impl WindowManager {
 
         tracing::info!("focusing container");
 
-        if workspace.monocle_container.is_some()
+        if workspace.monocle_container.is_some() {
-            && matches!(self.monocle_focus_behaviour, MonocleFocusBehaviour::Cycle)
-        {
             let cycle_direction = match direction {
                 OperationDirection::Left | OperationDirection::Down => CycleDirection::Previous,
                 OperationDirection::Right | OperationDirection::Up => CycleDirection::Next,
@@ -2123,8 +2118,7 @@ impl WindowManager {
             return self.cycle_monocle(cycle_direction);
         }
 
-        let new_idx =
+        let new_idx = if workspace.maximized_window.is_some() {
-            if workspace.maximized_window.is_some() || workspace.monocle_container.is_some() {
             None
         } else {
             workspace.new_idx_for_direction(direction)
@@ -3382,7 +3376,7 @@ impl WindowManager {
         let rules: &mut Vec<(usize, Layout)> = &mut workspace.layout_rules;
         rules.retain(|pair| pair.0 != at_container_count);
         rules.push((at_container_count, Layout::Default(layout)));
-        rules.sort_by_key(|a| a.0);
+        rules.sort_by(|a, b| a.0.cmp(&b.0));
 
         // If this is the focused workspace on a non-focused screen, let's update it
         if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
@@ -3425,7 +3419,7 @@ impl WindowManager {
         let rules: &mut Vec<(usize, Layout)> = &mut workspace.layout_rules;
         rules.retain(|pair| pair.0 != at_container_count);
         rules.push((at_container_count, Layout::Custom(layout)));
-        rules.sort_by_key(|a| a.0);
+        rules.sort_by(|a, b| a.0.cmp(&b.0));
 
         // If this is the focused workspace on a non-focused screen, let's update it
         if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {

komorebi/src/windows_api.rs

@@ -24,7 +24,6 @@ use windows::Win32::Foundation::WPARAM;
 use windows::Win32::Graphics::Dwm::DWM_CLOAKED_APP;
 use windows::Win32::Graphics::Dwm::DWM_CLOAKED_INHERITED;
 use windows::Win32::Graphics::Dwm::DWM_CLOAKED_SHELL;
-use windows::Win32::Graphics::Dwm::DWM_THUMBNAIL_PROPERTIES;
 use windows::Win32::Graphics::Dwm::DWMWA_BORDER_COLOR;
 use windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
 use windows::Win32::Graphics::Dwm::DWMWA_COLOR_NONE;
@@ -33,10 +32,7 @@ use windows::Win32::Graphics::Dwm::DWMWA_WINDOW_CORNER_PREFERENCE;
 use windows::Win32::Graphics::Dwm::DWMWCP_ROUND;
 use windows::Win32::Graphics::Dwm::DWMWINDOWATTRIBUTE;
 use windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
-use windows::Win32::Graphics::Dwm::DwmRegisterThumbnail;
 use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute;
-use windows::Win32::Graphics::Dwm::DwmUnregisterThumbnail;
-use windows::Win32::Graphics::Dwm::DwmUpdateThumbnailProperties;
 use windows::Win32::Graphics::Gdi::CreateSolidBrush;
 use windows::Win32::Graphics::Gdi::EnumDisplayMonitors;
 use windows::Win32::Graphics::Gdi::GetMonitorInfoW;
@@ -148,7 +144,6 @@ use windows::Win32::UI::WindowsAndMessaging::WS_DISABLED;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOACTIVATE;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TRANSPARENT;
 use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
 use windows::Win32::UI::WindowsAndMessaging::WS_SYSMENU;
 use windows::Win32::UI::WindowsAndMessaging::WindowFromPoint;
@@ -1348,41 +1343,6 @@ impl WindowsApi {
         }
     }
 
-    pub fn create_ghost_host_window(name: PCWSTR, instance: isize) -> eyre::Result<isize> {
-        unsafe {
-            CreateWindowExW(
-                WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_TRANSPARENT,
-                name,
-                name,
-                WS_POPUP,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                None,
-                None,
-                Option::from(HINSTANCE(as_ptr!(instance))),
-                None,
-            )?
-        }
-        .process()
-    }
-
-    pub fn dwm_register_thumbnail(dest_hwnd: isize, src_hwnd: isize) -> eyre::Result<isize> {
-        Ok(unsafe { DwmRegisterThumbnail(HWND(as_ptr!(dest_hwnd)), HWND(as_ptr!(src_hwnd))) }?)
-    }
-
-    pub fn dwm_update_thumbnail_properties(
-        hthumb: isize,
-        props: &DWM_THUMBNAIL_PROPERTIES,
-    ) -> eyre::Result<()> {
-        unsafe { DwmUpdateThumbnailProperties(hthumb, props) }.map_err(Into::into)
-    }
-
-    pub fn dwm_unregister_thumbnail(hthumb: isize) -> eyre::Result<()> {
-        unsafe { DwmUnregisterThumbnail(hthumb) }.map_err(Into::into)
-    }
-
     pub fn create_hidden_window(name: PCWSTR, instance: isize) -> eyre::Result<isize> {
         unsafe {
             CreateWindowExW(

komorebi/src/workspace.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::collections::VecDeque;
 use std::ffi::OsStr;
 use std::fmt::Display;
@@ -26,7 +25,6 @@ use crate::core::CustomLayout;
 use crate::core::CycleDirection;
 use crate::core::DefaultLayout;
 use crate::core::Layout;
-use crate::core::LayoutDefaultEntry;
 use crate::core::LayoutOptions;
 use crate::core::OperationDirection;
 use crate::core::Rect;
@@ -63,14 +61,6 @@ pub struct Workspace {
     pub layout: Layout,
     pub layout_options: Option<LayoutOptions>,
     pub layout_rules: Vec<(usize, Layout)>,
-    /// Threshold-based layout options rules (container_count >= threshold -> use these options).
-    /// Sorted by threshold ascending at load time.
-    #[serde(default)]
-    pub layout_options_rules: Vec<(usize, LayoutOptions)>,
-    /// Cached per-layout defaults from the global `layout_defaults` config setting.
-    /// Pre-sorted at config load time; used as fallback when workspace has no overrides.
-    #[serde(skip)]
-    pub(crate) layout_defaults_cache: HashMap<DefaultLayout, CachedLayoutDefault>,
     pub work_area_offset_rules: Vec<(usize, Rect)>,
     pub layout_flip: Option<Axis>,
     pub workspace_padding: Option<i32>,
@@ -129,8 +119,6 @@ impl Default for Workspace {
             layout: Layout::Default(DefaultLayout::BSP),
             layout_options: None,
             layout_rules: vec![],
-            layout_options_rules: vec![],
-            layout_defaults_cache: HashMap::new(),
             work_area_offset_rules: vec![],
             layout_flip: None,
             workspace_padding: Option::from(DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst)),
@@ -177,49 +165,8 @@ pub struct WorkspaceGlobals {
     pub floating_layer_behaviour: Option<FloatingLayerBehaviour>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-/// Cached per-layout default options (pre-sorted rules) derived from the global `layout_defaults`.
-pub(crate) struct CachedLayoutDefault {
-    pub layout_options: Option<LayoutOptions>,
-    /// Threshold-based rules, sorted by threshold ascending at load time
-    pub layout_options_rules: Vec<(usize, LayoutOptions)>,
-}
-
-/// Convert an optional HashMap of threshold-based layout options rules into a Vec sorted by
-/// threshold ascending.
-fn sorted_layout_options_rules(
-    rules: Option<&HashMap<usize, LayoutOptions>>,
-) -> Vec<(usize, LayoutOptions)> {
-    match rules {
-        Some(rules) => {
-            let mut sorted: Vec<(usize, LayoutOptions)> =
-                rules.iter().map(|(t, o)| (*t, *o)).collect();
-            sorted.sort_by_key(|(t, _)| *t);
-            sorted
-        }
-        None => vec![],
-    }
-}
-
-/// Find the highest matching threshold rule for the given container count.
-/// Rules must be sorted by threshold ascending.
-fn resolve_threshold_match(
-    rules: &[(usize, LayoutOptions)],
-    container_count: usize,
-) -> Option<LayoutOptions> {
-    rules
-        .iter()
-        .rev()
-        .find(|(threshold, _)| container_count >= *threshold)
-        .map(|(_, opts)| *opts)
-}
-
 impl Workspace {
-    pub fn load_static_config(
+    pub fn load_static_config(&mut self, config: &WorkspaceConfig) -> eyre::Result<()> {
-        &mut self,
-        config: &WorkspaceConfig,
-        layout_defaults: Option<&HashMap<DefaultLayout, LayoutDefaultEntry>>,
-    ) -> eyre::Result<()> {
         self.name = Option::from(config.name.clone());
 
         self.container_padding = config.container_padding;
@@ -304,78 +251,19 @@ impl Workspace {
         self.layout_flip = config.layout_flip;
         self.floating_layer_behaviour = config.floating_layer_behaviour;
         self.wallpaper = config.wallpaper.clone();
-
-        // Load layout options directly (LayoutOptions is used in both config and runtime)
         self.layout_options = config.layout_options;
 
-        // Load threshold-based layout options rules, sorted by threshold ascending
-        self.layout_options_rules =
-            sorted_layout_options_rules(config.layout_options_rules.as_ref());
-
         tracing::debug!(
-            "Workspace '{}' loaded layout_options: {:?}, layout_options_rules: {} entries",
+            "Workspace '{}' loaded layout_options: {:?}",
             self.name.as_deref().unwrap_or("unnamed"),
-            self.layout_options,
+            self.layout_options
-            self.layout_options_rules.len(),
         );
 
-        // Cache per-layout defaults from global layout_defaults, pre-sorting rules
-        self.layout_defaults_cache = if let Some(defaults) = layout_defaults {
-            defaults
-                .iter()
-                .map(|(layout, entry)| {
-                    (
-                        *layout,
-                        CachedLayoutDefault {
-                            layout_options: entry.layout_options,
-                            layout_options_rules: sorted_layout_options_rules(
-                                entry.layout_options_rules.as_ref(),
-                            ),
-                        },
-                    )
-                })
-                .collect()
-        } else {
-            HashMap::new()
-        };
-
         self.workspace_config = Some(config.clone());
 
         Ok(())
     }
 
-    /// Compute effective layout options using the complete-replacement cascade:
-    ///
-    /// If the workspace defines EITHER `layout_options` OR `layout_options_rules`,
-    /// it completely replaces the global `layout_defaults` for this layout.
-    /// Global defaults are only used when the workspace has NEITHER setting.
-    ///
-    /// Within the effective source (workspace or global):
-    ///   1. Try threshold match from rules (highest matching threshold wins)
-    ///   2. If a rule matches -> use it (full replacement of base)
-    ///   3. Else -> use the base `layout_options`
-    fn effective_layout_options(&self) -> Option<LayoutOptions> {
-        let container_count = self.containers().len();
-
-        let has_workspace_overrides =
-            self.layout_options.is_some() || !self.layout_options_rules.is_empty();
-
-        let (effective_base, effective_rules): (Option<LayoutOptions>, &[(usize, LayoutOptions)]) =
-            if has_workspace_overrides {
-                (self.layout_options, &self.layout_options_rules)
-            } else {
-                match &self.layout {
-                    Layout::Default(dl) => match self.layout_defaults_cache.get(dl) {
-                        Some(entry) => (entry.layout_options, &entry.layout_options_rules),
-                        None => (None, &[]),
-                    },
-                    Layout::Custom(_) => (None, &[]),
-                }
-            };
-
-        resolve_threshold_match(effective_rules, container_count).or(effective_base)
-    }
-
     pub fn hide(&mut self, omit: Option<isize>) {
         for window in self.floating_windows_mut().iter_mut().rev() {
             let mut should_hide = omit.is_none();
@@ -696,14 +584,10 @@ impl Workspace {
             } else if let Some(window) = &mut self.maximized_window {
                 window.maximize();
             } else if !self.containers().is_empty() {
-                let effective_layout_options = self.effective_layout_options();
-
                 tracing::debug!(
-                    "Workspace '{}' update() - effective_layout_options: {:?} (base: {:?}, rules: {})",
+                    "Workspace '{}' update() - self.layout_options before calculate: {:?}",
                     self.name.as_deref().unwrap_or("unnamed"),
-                    effective_layout_options,
+                    self.layout_options
-                    self.layout_options,
-                    self.layout_options_rules.len(),
                 );
                 let mut layouts = self.layout.as_boxed_arrangement().calculate(
                     &adjusted_work_area,
@@ -714,7 +598,7 @@ impl Workspace {
                     self.layout_flip,
                     &self.resize_dimensions,
                     self.focused_container_idx(),
-                    effective_layout_options,
+                    self.layout_options,
                     &self.latest_layout,
                 );
 

komorebic-no-console/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.42"
+version = "0.1.41"
 description = "The command-line interface (without a console) for Komorebi, a tiling window manager for Windows"
 repository = "https://github.com/LGUG2Z/komorebi"
 edition = "2024"

komorebic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.42"
+version = "0.1.41"
 description = "The command-line interface for Komorebi, a tiling window manager for Windows"
 repository = "https://github.com/LGUG2Z/komorebi"
 edition = "2024"

komorebic/src/main.rs

@@ -737,13 +737,6 @@ struct BorderStyle {
     style: komorebi_client::BorderStyle,
 }
 
-#[derive(Parser)]
-struct MonocleFocusBehaviour {
-    /// Desired monocle focus behaviour
-    #[clap(value_enum)]
-    behaviour: komorebi_client::MonocleFocusBehaviour,
-}
-
 #[derive(Parser)]
 struct BorderImplementation {
     /// Desired border implementation
@@ -1425,11 +1418,6 @@ enum SubCommand {
     CrossMonitorMoveBehaviour(CrossMonitorMoveBehaviour),
     /// Toggle the behaviour when moving windows across monitor boundaries
     ToggleCrossMonitorMoveBehaviour,
-    /// Set the behaviour when focusing in a direction while a monocle container is active
-    #[clap(arg_required_else_help = true)]
-    MonocleFocusBehaviour(MonocleFocusBehaviour),
-    /// Toggle the behaviour when focusing in a direction while a monocle container is active
-    ToggleMonocleFocusBehaviour,
     /// Set the operation behaviour when the focused window is not managed
     #[clap(arg_required_else_help = true)]
     UnmanagedWindowOperationBehaviour(UnmanagedWindowOperationBehaviour),
@@ -1936,12 +1924,14 @@ fn main() -> eyre::Result<()> {
                                 "Application specific configuration file path has not been set. Try running 'komorebic fetch-asc'\n"
                             );
                         }
-                        Some(AppSpecificConfigurationPath::Single(path)) if !path.exists() => {
+                        Some(AppSpecificConfigurationPath::Single(path)) => {
+                            if !path.exists() {
                                 println!(
                                     "Application specific configuration file path '{}' does not exist. Try running 'komorebic fetch-asc'\n",
                                     path.display()
                                 );
                             }
+                        }
                         _ => {}
                     }
                 }
@@ -3263,12 +3253,6 @@ if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) {
         SubCommand::ToggleCrossMonitorMoveBehaviour => {
             send_message(&SocketMessage::ToggleCrossMonitorMoveBehaviour)?;
         }
-        SubCommand::MonocleFocusBehaviour(args) => {
-            send_message(&SocketMessage::MonocleFocusBehaviour(args.behaviour))?;
-        }
-        SubCommand::ToggleMonocleFocusBehaviour => {
-            send_message(&SocketMessage::ToggleMonocleFocusBehaviour)?;
-        }
         SubCommand::UnmanagedWindowOperationBehaviour(args) => {
             send_message(&SocketMessage::UnmanagedWindowOperationBehaviour(
                 args.operation_behaviour,

schema.bar.json

@@ -9683,26 +9683,6 @@
             }
           ]
         },
-        "layout_options_rules": {
-          "description": "Threshold-based layout options rules (container_count >= threshold -> use these options).\nSorted by threshold ascending at load time.",
-          "type": "array",
-          "default": [],
-          "items": {
-            "type": "array",
-            "maxItems": 2,
-            "minItems": 2,
-            "prefixItems": [
-              {
-                "type": "integer",
-                "format": "uint",
-                "minimum": 0
-              },
-              {
-                "$ref": "#/$defs/LayoutOptions"
-              }
-            ]
-          }
-        },
         "layout_rules": {
           "type": "array",
           "items": {
@@ -10005,19 +9985,6 @@
             }
           ]
         },
-        "layout_options_rules": {
-          "description": "Threshold-based layout options rules in the format of threshold => options.\nWhen container count >= threshold, the highest matching threshold's options\nfully replace the base `layout_options`.\nThis follows the same threshold logic as `layout_rules`.",
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": false,
-          "patternProperties": {
-            "^\\d+$": {
-              "$ref": "#/$defs/LayoutOptions"
-            }
-          }
-        },
         "layout_rules": {
           "description": "Layout rules in the format of threshold => layout",
           "type": [

schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "title": "StaticConfig",
-  "description": "The `komorebi.json` static configuration file reference for `v0.1.42`",
+  "description": "The `komorebi.json` static configuration file reference for `v0.1.41`",
   "type": "object",
   "properties": {
     "animation": {
@@ -304,16 +304,6 @@
         "$ref": "#/$defs/MatchingRule"
       }
     },
-    "layout_defaults": {
-      "description": "Per-layout default options and rules, keyed by layout name.\nApplied as fallback when a workspace does not define its own layout_options or layout_options_rules.\nIf a workspace defines either setting, all global defaults for that layout are completely replaced.",
-      "type": [
-        "object",
-        "null"
-      ],
-      "additionalProperties": {
-        "$ref": "#/$defs/LayoutDefaultEntry"
-      }
-    },
     "manage_rules": {
       "description": "Individual window force-manage rules",
       "type": [
@@ -778,14 +768,6 @@
           "default": 60,
           "minimum": 0
         },
-        "ghost_movement": {
-          "description": "Render movement animations on a GPU-composited ghost surface (recommended).\nWhen false, falls back to the legacy per-frame MoveWindow path.",
-          "type": [
-            "boolean",
-            "null"
-          ],
-          "default": true
-        },
         "style": {
           "description": "Set the animation style",
           "anyOf": [
@@ -3308,36 +3290,6 @@
         "colours"
       ]
     },
-    "LayoutDefaultEntry": {
-      "description": "Per-layout default options entry for the `layout_defaults` global setting.\nContains both base layout options and threshold-based layout options rules.",
-      "type": "object",
-      "properties": {
-        "layout_options": {
-          "description": "Default layout options for this layout",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/LayoutOptions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "layout_options_rules": {
-          "description": "Threshold-based layout options rules in the format of threshold => options.\nWhen container count >= threshold, the highest matching threshold's options\nfully replace the base `layout_options`.",
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": false,
-          "patternProperties": {
-            "^\\d+$": {
-              "$ref": "#/$defs/LayoutOptions"
-            }
-          }
-        }
-      }
-    },
     "LayoutOptions": {
       "description": "Options for specific layouts",
       "type": "object",
@@ -4262,19 +4214,6 @@
             }
           ]
         },
-        "layout_options_rules": {
-          "description": "Threshold-based layout options rules in the format of threshold => options.\nWhen container count >= threshold, the highest matching threshold's options\nfully replace the base `layout_options`.\nThis follows the same threshold logic as `layout_rules`.",
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": false,
-          "patternProperties": {
-            "^\\d+$": {
-              "$ref": "#/$defs/LayoutOptions"
-            }
-          }
-        },
         "layout_rules": {
           "description": "Layout rules in the format of threshold => layout",
           "type": [