max / audiofiles
12 files changed,
+127 insertions,
-72 deletions
| @@ -1224,9 +1224,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" | |||
| 1224 | 1224 | ||
| 1225 | 1225 | [[package]] | |
| 1226 | 1226 | name = "ecolor" | |
| 1227 | - | version = "0.34.3" | |
| 1227 | + | version = "0.35.0" | |
| 1228 | 1228 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1229 | - | checksum = "a05fbfa222ffb51989d5ccf33e5f7aebfcf96c5023413856b0c3618a7f79896e" | |
| 1229 | + | checksum = "6758be723a3f298bbfda4db75748bc2ba0abafe096b6383c7c32da264764fbc3" | |
| 1230 | 1230 | dependencies = [ | |
| 1231 | 1231 | "bytemuck", | |
| 1232 | 1232 | "emath", | |
| @@ -1234,9 +1234,9 @@ dependencies = [ | |||
| 1234 | 1234 | ||
| 1235 | 1235 | [[package]] | |
| 1236 | 1236 | name = "eframe" | |
| 1237 | - | version = "0.34.3" | |
| 1237 | + | version = "0.35.0" | |
| 1238 | 1238 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1239 | - | checksum = "f98fe83b2589105b69dd25ca1e0fa2135a6e864d502fd8e08978f937e128cfef" | |
| 1239 | + | checksum = "8dc8234e2f681b2afd2b2e8c332fa614de2fddbdcb28d0acf5c420449682ea90" | |
| 1240 | 1240 | dependencies = [ | |
| 1241 | 1241 | "ahash", | |
| 1242 | 1242 | "bytemuck", | |
| @@ -1269,15 +1269,16 @@ dependencies = [ | |||
| 1269 | 1269 | ||
| 1270 | 1270 | [[package]] | |
| 1271 | 1271 | name = "egui" | |
| 1272 | - | version = "0.34.3" | |
| 1272 | + | version = "0.35.0" | |
| 1273 | 1273 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1274 | - | checksum = "42112be0ae157289312b92b3dfaf20e911b5a3c4c65d4aab0e7c47fbc0ce16e3" | |
| 1274 | + | checksum = "2796c98d50b79631281d516343a6f6e93c0666462ca36e2c93b39f25d7793325" | |
| 1275 | 1275 | dependencies = [ | |
| 1276 | 1276 | "accesskit", | |
| 1277 | 1277 | "ahash", | |
| 1278 | 1278 | "bitflags 2.13.1", | |
| 1279 | 1279 | "emath", | |
| 1280 | 1280 | "epaint", | |
| 1281 | + | "itertools", | |
| 1281 | 1282 | "log", | |
| 1282 | 1283 | "nohash-hasher", | |
| 1283 | 1284 | "profiling", | |
| @@ -1287,9 +1288,9 @@ dependencies = [ | |||
| 1287 | 1288 | ||
| 1288 | 1289 | [[package]] | |
| 1289 | 1290 | name = "egui-wgpu" | |
| 1290 | - | version = "0.34.3" | |
| 1291 | + | version = "0.35.0" | |
| 1291 | 1292 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1292 | - | checksum = "9f0c0559ac5598a1b887a6206dccbab7e3e6246c57cb00ae287262bd44776c9c" | |
| 1293 | + | checksum = "d2e6cfac0725563555fa4f91e9f799b9d7c6c5dd831fca6abc8234afc64b7a34" | |
| 1293 | 1294 | dependencies = [ | |
| 1294 | 1295 | "ahash", | |
| 1295 | 1296 | "bytemuck", | |
| @@ -1307,9 +1308,9 @@ dependencies = [ | |||
| 1307 | 1308 | ||
| 1308 | 1309 | [[package]] | |
| 1309 | 1310 | name = "egui-winit" | |
| 1310 | - | version = "0.34.3" | |
| 1311 | + | version = "0.35.0" | |
| 1311 | 1312 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1312 | - | checksum = "967c5b323625d46d46a59b5daba3fef742248d27693cc18972458619858c4239" | |
| 1313 | + | checksum = "9ea6bf3608db949588b95b8b341ee358d0c3f95cf4dc3f53d8d76717edee87db" | |
| 1313 | 1314 | dependencies = [ | |
| 1314 | 1315 | "arboard", | |
| 1315 | 1316 | "bytemuck", | |
| @@ -1328,22 +1329,23 @@ dependencies = [ | |||
| 1328 | 1329 | ||
| 1329 | 1330 | [[package]] | |
| 1330 | 1331 | name = "egui_extras" | |
| 1331 | - | version = "0.34.3" | |
| 1332 | + | version = "0.35.0" | |
| 1332 | 1333 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1333 | - | checksum = "598d8675f6fd9088db8a93d8c7aacda936b2f3d0c2b0660ad1744a45b5caf922" | |
| 1334 | + | checksum = "e2bd33be7338367bf21f54d62e069d58a5fb3ae033fa8bc6df7a77b9ef4cf957" | |
| 1334 | 1335 | dependencies = [ | |
| 1335 | 1336 | "ahash", | |
| 1336 | 1337 | "egui", | |
| 1337 | 1338 | "enum-map", | |
| 1339 | + | "itertools", | |
| 1338 | 1340 | "log", | |
| 1339 | 1341 | "profiling", | |
| 1340 | 1342 | ] | |
| 1341 | 1343 | ||
| 1342 | 1344 | [[package]] | |
| 1343 | 1345 | name = "egui_glow" | |
| 1344 | - | version = "0.34.3" | |
| 1346 | + | version = "0.35.0" | |
| 1345 | 1347 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1346 | - | checksum = "62b652957fa7e1ab01e8fecbfbf4e35f6e43a53fa98af8a562b50d5403cd44b9" | |
| 1348 | + | checksum = "52274b9bfb8d8e252cd0f00c9f6214f360d75a0962baa77a2d62ddb002fe99d4" | |
| 1347 | 1349 | dependencies = [ | |
| 1348 | 1350 | "bytemuck", | |
| 1349 | 1351 | "egui", | |
| @@ -1351,8 +1353,6 @@ dependencies = [ | |||
| 1351 | 1353 | "log", | |
| 1352 | 1354 | "memoffset", | |
| 1353 | 1355 | "profiling", | |
| 1354 | - | "wasm-bindgen", | |
| 1355 | - | "web-sys", | |
| 1356 | 1356 | "winit", | |
| 1357 | 1357 | ] | |
| 1358 | 1358 | ||
| @@ -1364,9 +1364,9 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" | |||
| 1364 | 1364 | ||
| 1365 | 1365 | [[package]] | |
| 1366 | 1366 | name = "emath" | |
| 1367 | - | version = "0.34.3" | |
| 1367 | + | version = "0.35.0" | |
| 1368 | 1368 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1369 | - | checksum = "b53f0d33a479321da6b0caa71366c9f67e8a2c149762d90bdc0d16e601ee8ecb" | |
| 1369 | + | checksum = "cd4ec073c9898516584d8c6cfdcee95b530b3d941cd5031ef4050aa36812308b" | |
| 1370 | 1370 | dependencies = [ | |
| 1371 | 1371 | "bytemuck", | |
| 1372 | 1372 | ] | |
| @@ -1429,9 +1429,9 @@ dependencies = [ | |||
| 1429 | 1429 | ||
| 1430 | 1430 | [[package]] | |
| 1431 | 1431 | name = "epaint" | |
| 1432 | - | version = "0.34.3" | |
| 1432 | + | version = "0.35.0" | |
| 1433 | 1433 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1434 | - | checksum = "6675898a291ec212fc3df04f537d177fce8496120244590e6359dcaa4c25da79" | |
| 1434 | + | checksum = "4e60a8888b51da911df23918fd7301359b1d43a406a0ff3b8863af093dd7fc6c" | |
| 1435 | 1435 | dependencies = [ | |
| 1436 | 1436 | "ahash", | |
| 1437 | 1437 | "bytemuck", | |
| @@ -1439,6 +1439,7 @@ dependencies = [ | |||
| 1439 | 1439 | "emath", | |
| 1440 | 1440 | "epaint_default_fonts", | |
| 1441 | 1441 | "font-types", | |
| 1442 | + | "harfrust", | |
| 1442 | 1443 | "log", | |
| 1443 | 1444 | "nohash-hasher", | |
| 1444 | 1445 | "parking_lot", | |
| @@ -1446,14 +1447,16 @@ dependencies = [ | |||
| 1446 | 1447 | "self_cell", | |
| 1447 | 1448 | "skrifa", | |
| 1448 | 1449 | "smallvec", | |
| 1450 | + | "unicode-general-category", | |
| 1451 | + | "unicode-segmentation", | |
| 1449 | 1452 | "vello_cpu", | |
| 1450 | 1453 | ] | |
| 1451 | 1454 | ||
| 1452 | 1455 | [[package]] | |
| 1453 | 1456 | name = "epaint_default_fonts" | |
| 1454 | - | version = "0.34.3" | |
| 1457 | + | version = "0.35.0" | |
| 1455 | 1458 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1456 | - | checksum = "f8970033a4282a7bcf899b38b5ed3a58b732fe093d03785d58648515d8d309da" | |
| 1459 | + | checksum = "13ee4e1f553a3584c301f3a56ff1a775f1384781396cea301c8d952e9b93f560" | |
| 1457 | 1460 | ||
| 1458 | 1461 | [[package]] | |
| 1459 | 1462 | name = "equivalent" | |
| @@ -1548,12 +1551,9 @@ dependencies = [ | |||
| 1548 | 1551 | ||
| 1549 | 1552 | [[package]] | |
| 1550 | 1553 | name = "fearless_simd" | |
| 1551 | - | version = "0.3.0" | |
| 1554 | + | version = "0.4.1" | |
| 1552 | 1555 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1553 | - | checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903" | |
| 1554 | - | dependencies = [ | |
| 1555 | - | "bytemuck", | |
| 1556 | - | ] | |
| 1556 | + | checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693" | |
| 1557 | 1557 | ||
| 1558 | 1558 | [[package]] | |
| 1559 | 1559 | name = "field-offset" | |
| @@ -1941,6 +1941,22 @@ dependencies = [ | |||
| 1941 | 1941 | ] | |
| 1942 | 1942 | ||
| 1943 | 1943 | [[package]] | |
| 1944 | + | name = "glifo" | |
| 1945 | + | version = "0.1.1" | |
| 1946 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 1947 | + | checksum = "d99fc21d493812643aae86d53b7bbd02f376434a90317e8a790bc209fdd6605e" | |
| 1948 | + | dependencies = [ | |
| 1949 | + | "bytemuck", | |
| 1950 | + | "foldhash", | |
| 1951 | + | "hashbrown 0.17.1", | |
| 1952 | + | "log", | |
| 1953 | + | "peniko", | |
| 1954 | + | "skrifa", | |
| 1955 | + | "smallvec", | |
| 1956 | + | "vello_common", | |
| 1957 | + | ] | |
| 1958 | + | ||
| 1959 | + | [[package]] | |
| 1944 | 1960 | name = "glob" | |
| 1945 | 1961 | version = "0.3.3" | |
| 1946 | 1962 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| @@ -2088,6 +2104,15 @@ dependencies = [ | |||
| 2088 | 2104 | ] | |
| 2089 | 2105 | ||
| 2090 | 2106 | [[package]] | |
| 2107 | + | name = "guillotiere" | |
| 2108 | + | version = "0.7.0" | |
| 2109 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2110 | + | checksum = "6b17e70c989c36bad147b27a58d148c0741c51448aa5653436547323e524d0ab" | |
| 2111 | + | dependencies = [ | |
| 2112 | + | "euclid", | |
| 2113 | + | ] | |
| 2114 | + | ||
| 2115 | + | [[package]] | |
| 2091 | 2116 | name = "h2" | |
| 2092 | 2117 | version = "0.4.15" | |
| 2093 | 2118 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| @@ -2119,6 +2144,18 @@ dependencies = [ | |||
| 2119 | 2144 | ] | |
| 2120 | 2145 | ||
| 2121 | 2146 | [[package]] | |
| 2147 | + | name = "harfrust" | |
| 2148 | + | version = "0.7.0" | |
| 2149 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2150 | + | checksum = "0431e8e389aa0f1e72bb9d1c2db8957a1a7a3580e8ed97db819c14837aac9b3e" | |
| 2151 | + | dependencies = [ | |
| 2152 | + | "bitflags 2.13.1", | |
| 2153 | + | "bytemuck", | |
| 2154 | + | "read-fonts", | |
| 2155 | + | "smallvec", | |
| 2156 | + | ] | |
| 2157 | + | ||
| 2158 | + | [[package]] | |
| 2122 | 2159 | name = "hashbrown" | |
| 2123 | 2160 | version = "0.16.1" | |
| 2124 | 2161 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| @@ -2132,6 +2169,9 @@ name = "hashbrown" | |||
| 2132 | 2169 | version = "0.17.1" | |
| 2133 | 2170 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2134 | 2171 | checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" | |
| 2172 | + | dependencies = [ | |
| 2173 | + | "foldhash", | |
| 2174 | + | ] | |
| 2135 | 2175 | ||
| 2136 | 2176 | [[package]] | |
| 2137 | 2177 | name = "hashlink" | |
| @@ -2527,6 +2567,15 @@ dependencies = [ | |||
| 2527 | 2567 | ] | |
| 2528 | 2568 | ||
| 2529 | 2569 | [[package]] | |
| 2570 | + | name = "itertools" | |
| 2571 | + | version = "0.14.0" | |
| 2572 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2573 | + | checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" | |
| 2574 | + | dependencies = [ | |
| 2575 | + | "either", | |
| 2576 | + | ] | |
| 2577 | + | ||
| 2578 | + | [[package]] | |
| 2530 | 2579 | name = "itoa" | |
| 2531 | 2580 | version = "1.0.18" | |
| 2532 | 2581 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| @@ -4074,9 +4123,9 @@ dependencies = [ | |||
| 4074 | 4123 | ||
| 4075 | 4124 | [[package]] | |
| 4076 | 4125 | name = "read-fonts" | |
| 4077 | - | version = "0.37.0" | |
| 4126 | + | version = "0.39.2" | |
| 4078 | 4127 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 4079 | - | checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" | |
| 4128 | + | checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" | |
| 4080 | 4129 | dependencies = [ | |
| 4081 | 4130 | "bytemuck", | |
| 4082 | 4131 | "font-types", | |
| @@ -4650,9 +4699,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" | |||
| 4650 | 4699 | ||
| 4651 | 4700 | [[package]] | |
| 4652 | 4701 | name = "skrifa" | |
| 4653 | - | version = "0.40.0" | |
| 4702 | + | version = "0.42.1" | |
| 4654 | 4703 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 4655 | - | checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" | |
| 4704 | + | checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" | |
| 4656 | 4705 | dependencies = [ | |
| 4657 | 4706 | "bytemuck", | |
| 4658 | 4707 | "read-fonts", | |
| @@ -5597,6 +5646,12 @@ dependencies = [ | |||
| 5597 | 5646 | ] | |
| 5598 | 5647 | ||
| 5599 | 5648 | [[package]] | |
| 5649 | + | name = "unicode-general-category" | |
| 5650 | + | version = "1.1.0" | |
| 5651 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 5652 | + | checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f" | |
| 5653 | + | ||
| 5654 | + | [[package]] | |
| 5600 | 5655 | name = "unicode-ident" | |
| 5601 | 5656 | version = "1.0.24" | |
| 5602 | 5657 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| @@ -5689,27 +5744,29 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" | |||
| 5689 | 5744 | ||
| 5690 | 5745 | [[package]] | |
| 5691 | 5746 | name = "vello_common" | |
| 5692 | - | version = "0.0.6" | |
| 5747 | + | version = "0.0.9" | |
| 5693 | 5748 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 5694 | - | checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b" | |
| 5749 | + | checksum = "19d672facaa2d697285a786cd9d44d614cd2ce54cdc022504bf339f8fff3b750" | |
| 5695 | 5750 | dependencies = [ | |
| 5696 | 5751 | "bytemuck", | |
| 5697 | 5752 | "fearless_simd", | |
| 5698 | - | "hashbrown 0.16.1", | |
| 5753 | + | "guillotiere", | |
| 5754 | + | "hashbrown 0.17.1", | |
| 5699 | 5755 | "log", | |
| 5700 | 5756 | "peniko", | |
| 5701 | - | "skrifa", | |
| 5702 | 5757 | "smallvec", | |
| 5758 | + | "thiserror 2.0.19", | |
| 5703 | 5759 | ] | |
| 5704 | 5760 | ||
| 5705 | 5761 | [[package]] | |
| 5706 | 5762 | name = "vello_cpu" | |
| 5707 | - | version = "0.0.6" | |
| 5763 | + | version = "0.0.9" | |
| 5708 | 5764 | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 5709 | - | checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc" | |
| 5765 | + | checksum = "588691169aed86b5c8fb487266afee01323234e6fd0a3f2aaec0eaa8e4007f23" | |
| 5710 | 5766 | dependencies = [ | |
| 5711 | 5767 | "bytemuck", | |
| 5712 | - | "hashbrown 0.16.1", | |
| 5768 | + | "glifo", | |
| 5769 | + | "hashbrown 0.17.1", | |
| 5713 | 5770 | "vello_common", | |
| 5714 | 5771 | ] | |
| 5715 | 5772 |
| @@ -12,9 +12,9 @@ audiofiles-core = { path = "crates/audiofiles-core" } | |||
| 12 | 12 | audiofiles-browser = { path = "crates/audiofiles-browser" } | |
| 13 | 13 | audiofiles-sync = { path = "crates/audiofiles-sync" } | |
| 14 | 14 | audiofiles-rhai = { path = "crates/audiofiles-rhai" } | |
| 15 | - | egui = { version = "0.34", default-features = false, features = ["default_fonts"] } | |
| 16 | - | egui_extras = { version = "0.34", default-features = false } | |
| 17 | - | eframe = { version = "0.34", default-features = false, features = ["default_fonts", "glow"] } | |
| 15 | + | egui = { version = "0.35", default-features = false, features = ["default_fonts"] } | |
| 16 | + | egui_extras = { version = "0.35", default-features = false } | |
| 17 | + | eframe = { version = "0.35", default-features = false, features = ["default_fonts", "glow"] } | |
| 18 | 18 | cpal = "0.18" | |
| 19 | 19 | rusqlite = { version = "0.39", features = ["bundled", "functions"] } | |
| 20 | 20 | thiserror = "2.0.18" |
| @@ -36,5 +36,5 @@ keyring = { version = "4", default-features = false, features = ["v1"] } | |||
| 36 | 36 | tempfile = "3" | |
| 37 | 37 | ||
| 38 | 38 | [target.'cfg(target_os = "linux")'.dependencies] | |
| 39 | - | eframe = { version = "0.34", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] } | |
| 39 | + | eframe = { version = "0.35", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] } | |
| 40 | 40 | gtk = "0.18" |
| @@ -40,7 +40,7 @@ impl AudioFilesApp { | |||
| 40 | 40 | } | |
| 41 | 41 | } | |
| 42 | 42 | ||
| 43 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 43 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 44 | 44 | let available = ui.available_size(); | |
| 45 | 45 | ||
| 46 | 46 | ui.add_space((available.y * 0.35).max(40.0)); |
| @@ -885,7 +885,7 @@ impl AudioFilesApp { | |||
| 885 | 885 | /// dead-end label with explicit recovery actions: Retry the same path, | |
| 886 | 886 | /// Choose a different vault, or open the data folder for manual triage. | |
| 887 | 887 | fn draw_db_error_screen(&mut self, ui: &mut egui::Ui) { | |
| 888 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 888 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 889 | 889 | ui.add_space(48.0); | |
| 890 | 890 | ui.vertical_centered(|ui| { | |
| 891 | 891 | ui.heading("audiofiles"); |
| @@ -21,7 +21,7 @@ impl AudioFilesApp { | |||
| 21 | 21 | self.vault_setup_name = DEFAULT_VAULT_NAME.to_string(); | |
| 22 | 22 | } | |
| 23 | 23 | ||
| 24 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 24 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 25 | 25 | let available = ui.available_size(); | |
| 26 | 26 | ui.add_space((available.y * 0.20).max(40.0)); | |
| 27 | 27 |
| @@ -190,14 +190,12 @@ fn draw_normal_browser( | |||
| 190 | 190 | let ctx = ui.ctx().clone(); | |
| 191 | 191 | ||
| 192 | 192 | // Top toolbar (breadcrumb + search) | |
| 193 | - | egui::Panel::top("toolbar") | |
| 194 | - | .exact_size(56.0) | |
| 195 | - | .show_inside(ui, |ui| { | |
| 196 | - | toolbar::draw_toolbar(ui, state, sync_manager); | |
| 197 | - | }); | |
| 193 | + | egui::Panel::top("toolbar").exact_size(56.0).show(ui, |ui| { | |
| 194 | + | toolbar::draw_toolbar(ui, state, sync_manager); | |
| 195 | + | }); | |
| 198 | 196 | ||
| 199 | 197 | // Bottom footer | |
| 200 | - | egui::Panel::bottom("footer").show_inside(ui, |ui| { | |
| 198 | + | egui::Panel::bottom("footer").show(ui, |ui| { | |
| 201 | 199 | let ctx = ui.ctx().clone(); | |
| 202 | 200 | footer::draw_footer(ui, &ctx, state); | |
| 203 | 201 | }); | |
| @@ -212,7 +210,7 @@ fn draw_normal_browser( | |||
| 212 | 210 | egui::Panel::left("filter_panel") | |
| 213 | 211 | .default_size(200.0) | |
| 214 | 212 | .size_range(160.0..=300.0) | |
| 215 | - | .show_inside(ui, |ui| { | |
| 213 | + | .show(ui, |ui| { | |
| 216 | 214 | egui::ScrollArea::vertical().show(ui, |ui| { | |
| 217 | 215 | filter_panel::draw_filter_panel(ui, state); | |
| 218 | 216 | }); | |
| @@ -221,7 +219,7 @@ fn draw_normal_browser( | |||
| 221 | 219 | egui::Panel::left("sidebar") | |
| 222 | 220 | .default_size(180.0) | |
| 223 | 221 | .size_range(120.0..=280.0) | |
| 224 | - | .show_inside(ui, |ui| { | |
| 222 | + | .show(ui, |ui| { | |
| 225 | 223 | sidebar::draw_sidebar(ui, state); | |
| 226 | 224 | }); | |
| 227 | 225 | } | |
| @@ -233,7 +231,7 @@ fn draw_normal_browser( | |||
| 233 | 231 | egui::Panel::right("detail") | |
| 234 | 232 | .default_size(250.0) | |
| 235 | 233 | .size_range(200.0..=400.0) | |
| 236 | - | .show_inside(ui, |ui| { | |
| 234 | + | .show(ui, |ui| { | |
| 237 | 235 | egui::ScrollArea::vertical().show(ui, |ui| { | |
| 238 | 236 | detail::draw_detail(ui, state); | |
| 239 | 237 | }); | |
| @@ -241,7 +239,7 @@ fn draw_normal_browser( | |||
| 241 | 239 | } | |
| 242 | 240 | ||
| 243 | 241 | // Central file list | |
| 244 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 242 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 245 | 243 | file_list::draw_file_list(ui, state, sync_manager); | |
| 246 | 244 | }); | |
| 247 | 245 | } |
| @@ -98,7 +98,7 @@ pub fn draw_configure_export(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 98 | 98 | _ => return, | |
| 99 | 99 | }; | |
| 100 | 100 | ||
| 101 | - | egui::Panel::bottom("export_footer").show_inside(ui, |ui| { | |
| 101 | + | egui::Panel::bottom("export_footer").show(ui, |ui| { | |
| 102 | 102 | ui.add_space(theme::space::SM); | |
| 103 | 103 | ||
| 104 | 104 | // Warnings | |
| @@ -233,7 +233,7 @@ pub fn draw_configure_export(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 233 | 233 | ui.add_space(theme::space::XS); | |
| 234 | 234 | }); | |
| 235 | 235 | ||
| 236 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 236 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 237 | 237 | egui::ScrollArea::vertical().show(ui, |ui| { | |
| 238 | 238 | ui.heading("Export Samples"); | |
| 239 | 239 | ui.add_space(theme::space::SM); | |
| @@ -598,7 +598,7 @@ pub fn draw_export_progress(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 598 | 598 | _ => return, | |
| 599 | 599 | }; | |
| 600 | 600 | ||
| 601 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 601 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 602 | 602 | ui.heading("Exporting..."); | |
| 603 | 603 | ui.add_space(theme::space::SECTION); | |
| 604 | 604 | ||
| @@ -639,7 +639,7 @@ pub fn draw_export_complete(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 639 | 639 | _ => return, | |
| 640 | 640 | }; | |
| 641 | 641 | ||
| 642 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 642 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 643 | 643 | ui.heading("Export Complete"); | |
| 644 | 644 | ui.add_space(theme::space::LG); | |
| 645 | 645 |
| @@ -17,7 +17,7 @@ pub fn draw_configure_import(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 17 | 17 | _ => return, | |
| 18 | 18 | }; | |
| 19 | 19 | ||
| 20 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 20 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 21 | 21 | // Scroll the body so the Cancel/Import row stays reachable on a short | |
| 22 | 22 | // window or when the merge combo + vault field + warnings all expand (P5). | |
| 23 | 23 | egui::ScrollArea::vertical().show(ui, |ui| { | |
| @@ -263,7 +263,7 @@ pub fn draw_configure_analysis(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 263 | 263 | _ => return, | |
| 264 | 264 | }; | |
| 265 | 265 | ||
| 266 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 266 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 267 | 267 | widgets::wizard_steps(ui, super::WIZARD_STEPS, 2); | |
| 268 | 268 | ui.heading("Configure Analysis"); | |
| 269 | 269 | ui.add_space(theme::space::MD); |
| @@ -117,7 +117,7 @@ pub fn draw_import_progress(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 117 | 117 | _ => return, | |
| 118 | 118 | }; | |
| 119 | 119 | ||
| 120 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 120 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 121 | 121 | // Keep the step rail visible during the import work (P5) — current step | |
| 122 | 122 | // is still Configure, since import is the work that step kicks off. | |
| 123 | 123 | widgets::wizard_steps(ui, super::WIZARD_STEPS, 0); | |
| @@ -234,7 +234,7 @@ pub fn draw_cleanup_progress(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 234 | 234 | _ => return, | |
| 235 | 235 | }; | |
| 236 | 236 | ||
| 237 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 237 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 238 | 238 | ui.heading("Cleaning Up Samples..."); | |
| 239 | 239 | ui.add_space(theme::space::LG); | |
| 240 | 240 | ||
| @@ -278,7 +278,7 @@ pub fn draw_analysis_progress(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 278 | 278 | _ => return, | |
| 279 | 279 | }; | |
| 280 | 280 | ||
| 281 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 281 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 282 | 282 | // Step rail stays visible on the slow Analyze screen, where orientation | |
| 283 | 283 | // matters most (P5). Analyze is step index 2. | |
| 284 | 284 | widgets::wizard_steps(ui, super::WIZARD_STEPS, 2); | |
| @@ -364,7 +364,7 @@ pub fn draw_operation_cancelled(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 364 | 364 | ), | |
| 365 | 365 | }; | |
| 366 | 366 | ||
| 367 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 367 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 368 | 368 | ui.heading(heading); | |
| 369 | 369 | ui.add_space(theme::space::LG); | |
| 370 | 370 | ui.label( |
| @@ -12,7 +12,7 @@ pub fn draw_review_errors(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 12 | 12 | return; | |
| 13 | 13 | } | |
| 14 | 14 | ||
| 15 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 15 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 16 | 16 | ui.heading("Import Summary"); | |
| 17 | 17 | ui.add_space(theme::space::LG); | |
| 18 | 18 |
| @@ -20,7 +20,7 @@ pub fn draw_tag_folders(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 20 | 20 | _ => return, | |
| 21 | 21 | }; | |
| 22 | 22 | ||
| 23 | - | egui::Panel::bottom("tag_folders_footer").show_inside(ui, |ui| { | |
| 23 | + | egui::Panel::bottom("tag_folders_footer").show(ui, |ui| { | |
| 24 | 24 | ui.add_space(theme::space::SM); | |
| 25 | 25 | ui.horizontal(|ui| { | |
| 26 | 26 | if ui.button("Skip").clicked() { | |
| @@ -40,7 +40,7 @@ pub fn draw_tag_folders(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 40 | 40 | ui.add_space(theme::space::XS); | |
| 41 | 41 | }); | |
| 42 | 42 | ||
| 43 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 43 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 44 | 44 | // m-6: the breadcrumb is decorative per C-1 — the wizard has no | |
| 45 | 45 | // cross-step navigation post-Skip, so the step-1 "Tag folders" cell | |
| 46 | 46 | // staying highlighted after Skip is cosmetic only. `wizard_steps` has | |
| @@ -152,7 +152,7 @@ pub fn draw_review_suggestions(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 152 | 152 | _ => return, | |
| 153 | 153 | }; | |
| 154 | 154 | ||
| 155 | - | egui::Panel::top("review_header").show_inside(ui, |ui| { | |
| 155 | + | egui::Panel::top("review_header").show(ui, |ui| { | |
| 156 | 156 | widgets::wizard_steps(ui, super::WIZARD_STEPS, 3); | |
| 157 | 157 | ui.horizontal(|ui| { | |
| 158 | 158 | ui.heading("Review Tag Suggestions"); | |
| @@ -230,7 +230,7 @@ pub fn draw_review_suggestions(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 230 | 230 | } | |
| 231 | 231 | }); | |
| 232 | 232 | ||
| 233 | - | egui::Panel::bottom("review_footer").show_inside(ui, |ui| { | |
| 233 | + | egui::Panel::bottom("review_footer").show(ui, |ui| { | |
| 234 | 234 | ui.add_space(theme::space::SM); | |
| 235 | 235 | ui.horizontal(|ui| { | |
| 236 | 236 | if ui.button("Cancel").clicked() { | |
| @@ -274,7 +274,7 @@ pub fn draw_review_suggestions(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 274 | 274 | egui::Panel::left("review_samples") | |
| 275 | 275 | .resizable(true) | |
| 276 | 276 | .default_size(220.0) | |
| 277 | - | .show_inside(ui, |ui| { | |
| 277 | + | .show(ui, |ui| { | |
| 278 | 278 | // p-3: sort selector at the top of the side panel. The sort | |
| 279 | 279 | // doesn't mutate `items` — `display_order` below maps display | |
| 280 | 280 | // position → item index so `current_idx` keeps pointing at the | |
| @@ -351,7 +351,7 @@ pub fn draw_review_suggestions(ui: &mut egui::Ui, state: &mut BrowserState) { | |||
| 351 | 351 | }); | |
| 352 | 352 | }); | |
| 353 | 353 | ||
| 354 | - | egui::CentralPanel::default().show_inside(ui, |ui| { | |
| 354 | + | egui::CentralPanel::default().show(ui, |ui| { | |
| 355 | 355 | if let ImportMode::ReviewSuggestions { | |
| 356 | 356 | ref mut items, | |
| 357 | 357 | current_idx, |