max / audiofiles
6 files changed,
+20 insertions,
-20 deletions
| @@ -434,8 +434,8 @@ | |||
| 434 | 434 | "hound", | |
| 435 | 435 | "libc", | |
| 436 | 436 | "makeover", | |
| 437 | - | "makeover-egui", | |
| 438 | 437 | "makeover-geometry", | |
| 438 | + | "makeover-immediate", | |
| 439 | 439 | "makeover-layout", | |
| 440 | 440 | "objc2 0.6.4", | |
| 441 | 441 | "objc2-app-kit 0.3.2", | |
| @@ -2981,19 +2981,19 @@ | |||
| 2981 | 2981 | ] | |
| 2982 | 2982 | ||
| 2983 | 2983 | [[package]] | |
| 2984 | - | name = "makeover-egui" | |
| 2984 | + | name = "makeover-geometry" | |
| 2985 | + | version = "0.1.0" | |
| 2986 | + | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2987 | + | checksum = "9d8b94e51333489b0a79bb63ad4100ca49726f2048e2477f6ee3d6dd822f9327" | |
| 2988 | + | ||
| 2989 | + | [[package]] | |
| 2990 | + | name = "makeover-immediate" | |
| 2985 | 2991 | version = "0.1.0" | |
| 2986 | 2992 | dependencies = [ | |
| 2987 | 2993 | "egui", | |
| 2988 | 2994 | "makeover-layout", | |
| 2989 | 2995 | ] | |
| 2990 | 2996 | ||
| 2991 | - | [[package]] | |
| 2992 | - | name = "makeover-geometry" | |
| 2993 | - | version = "0.1.0" | |
| 2994 | - | source = "registry+https://github.com/rust-lang/crates.io-index" | |
| 2995 | - | checksum = "9d8b94e51333489b0a79bb63ad4100ca49726f2048e2477f6ee3d6dd822f9327" | |
| 2996 | - | ||
| 2997 | 2997 | [[package]] | |
| 2998 | 2998 | name = "makeover-layout" | |
| 2999 | 2999 | version = "0.1.0" |
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | # unpublished; they become version deps when makeover-layout 0.1.0 ships, | |
| 17 | 17 | # which waits on a second renderer exercising the vocabulary. | |
| 18 | 18 | makeover-layout = { path = "../../Libraries/makeover-layout" } | |
| 19 | - | makeover-egui = { path = "../../Libraries/makeover-egui" } | |
| 19 | + | makeover-immediate = { path = "../../Libraries/makeover-immediate" } | |
| 20 | 20 | egui = { version = "0.35", default-features = false, features = ["default_fonts"] } | |
| 21 | 21 | egui_extras = { version = "0.35", default-features = false } | |
| 22 | 22 | eframe = { version = "0.35", default-features = false, features = ["default_fonts", "glow"] } |
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | audiofiles-sync = { workspace = true } | |
| 14 | 14 | egui = { workspace = true } | |
| 15 | 15 | makeover-layout = { workspace = true } | |
| 16 | - | makeover-egui = { workspace = true } | |
| 16 | + | makeover-immediate = { workspace = true } | |
| 17 | 17 | egui_extras = { workspace = true } | |
| 18 | 18 | symphonia = { workspace = true } | |
| 19 | 19 | hound = { workspace = true } |
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | //! | |
| 9 | 9 | //! Kept as a plain module for now. If a second project ever needs the same | |
| 10 | 10 | //! shim (Alloy's egui surfaces are the most likely candidate), promote to | |
| 11 | - | //! `Libraries/makeover-egui` with the same public API and swap the `use` | |
| 11 | + | //! `Libraries/makeover-immediate` with the same public API and swap the `use` | |
| 12 | 12 | //! sites; nothing here depends on audiofiles-specific state. | |
| 13 | 13 | ||
| 14 | 14 | use egui::Color32; |
| @@ -347,7 +347,7 @@ | |||
| 347 | 347 | THEME.read().border | |
| 348 | 348 | } | |
| 349 | 349 | ||
| 350 | - | /// This app's resolved theme, as the palette `makeover-egui` renders against. | |
| 350 | + | /// This app's resolved theme, as the palette `makeover-immediate` renders against. | |
| 351 | 351 | /// | |
| 352 | 352 | /// The whole makeover-to-renderer adapter, and deliberately a snapshot rather | |
| 353 | 353 | /// than a handle: it is six `Copy` colors read under one lock, so a caller | |
| @@ -358,9 +358,9 @@ | |||
| 358 | 358 | /// app is on 2.2.0. The renderer supplies `surface-page` in its place, which is | |
| 359 | 359 | /// exactly what [`super::widgets::inset_well`] filled by hand before, so the | |
| 360 | 360 | /// fallback is a transcription of current behaviour rather than a new choice. | |
| 361 | - | pub fn palette() -> makeover_egui::Palette { | |
| 361 | + | pub fn palette() -> makeover_immediate::Palette { | |
| 362 | 362 | let t = THEME.read(); | |
| 363 | - | makeover_egui::Palette { | |
| 363 | + | makeover_immediate::Palette { | |
| 364 | 364 | page: t.surface_page, | |
| 365 | 365 | raised: t.surface_raised, | |
| 366 | 366 | overlay: t.surface_overlay, | |
| @@ -413,12 +413,12 @@ | |||
| 413 | 413 | ||
| 414 | 414 | /// Paint a 1px two-tone frame just inside `rect`. | |
| 415 | 415 | /// | |
| 416 | - | /// Now a thin call into `makeover-egui`, which holds the polyline geometry | |
| 416 | + | /// Now a thin call into `makeover-immediate`, which holds the polyline geometry | |
| 417 | 417 | /// and the half-stroke inset. What stays here is the choice of stroke | |
| 418 | 418 | /// width, which is a value and so belongs to the app until | |
| 419 | 419 | /// `makeover-geometry` carries border widths. | |
| 420 | 420 | pub fn paint(painter: &egui::Painter, rect: egui::Rect, kind: Bevel) { | |
| 421 | - | makeover_egui::paint_bevel(painter, rect, kind, &palette(), stroke::DEFAULT); | |
| 421 | + | makeover_immediate::paint_bevel(painter, rect, kind, &palette(), stroke::DEFAULT); | |
| 422 | 422 | } | |
| 423 | 423 | ||
| 424 | 424 | #[cfg(test)] |
| @@ -364,11 +364,11 @@ | |||
| 364 | 364 | /// the bug this replaced — the banners were filled `surface_sunken`, which is | |
| 365 | 365 | /// the well colour, while being shaped like neither a well nor a card. | |
| 366 | 366 | pub fn raised_frame<R>(ui: &mut egui::Ui, add_contents: impl FnOnce(&mut egui::Ui) -> R) -> R { | |
| 367 | - | makeover_egui::frame( | |
| 367 | + | makeover_immediate::frame( | |
| 368 | 368 | ui, | |
| 369 | 369 | makeover_layout::Depth::Raised, | |
| 370 | 370 | &theme::palette(), | |
| 371 | - | makeover_egui::FrameStyle { | |
| 371 | + | makeover_immediate::FrameStyle { | |
| 372 | 372 | radius: theme::radius_container(), | |
| 373 | 373 | margin: egui::Margin::same(theme::space::group() as i8), | |
| 374 | 374 | stroke: theme::stroke::DEFAULT, | |
| @@ -386,11 +386,11 @@ | |||
| 386 | 386 | /// The one-point inner margin keeps content off the frame. Without it the first | |
| 387 | 387 | /// row of a table sits underneath the bevel and the well loses its top edge. | |
| 388 | 388 | pub fn inset_well<R>(ui: &mut egui::Ui, add_contents: impl FnOnce(&mut egui::Ui) -> R) -> R { | |
| 389 | - | makeover_egui::frame( | |
| 389 | + | makeover_immediate::frame( | |
| 390 | 390 | ui, | |
| 391 | 391 | makeover_layout::Depth::Well, | |
| 392 | 392 | &theme::palette(), | |
| 393 | - | makeover_egui::FrameStyle { | |
| 393 | + | makeover_immediate::FrameStyle { | |
| 394 | 394 | radius: theme::radius_container(), | |
| 395 | 395 | margin: egui::Margin::same(theme::stroke::DEFAULT as i8), | |
| 396 | 396 | stroke: theme::stroke::DEFAULT, |