From 5763ec7e58485c51428e337d60b7e838bf1ca0ec Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 14 Oct 2026 22:31:08 +0200 Subject: [PATCH] Game menus: AA veils over bright backdrops, a whole wordmark on the home page Every page and the in-world screens veil the backdrop at 0.90; the home page at 0.80, with its secondary text in ink_soft (Ui::muted). Muted text over the backdrop is BACKDROP_MUTED. The home page's faint wordmark is now whole: as wide as the content column, above the footnote, instead of cut off at the bottom right. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/front.rs | 24 ++++++++----- crates/horizon-client/src/options_horizon.rs | 2 +- crates/horizon-client/src/ui_theme.rs | 37 ++++++++++++-------- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/crates/horizon-client/src/front.rs b/crates/horizon-client/src/front.rs index df3c398f3..b4a225030 100644 --- a/crates/horizon-client/src/front.rs +++ b/crates/horizon-client/src/front.rs @@ -110,10 +110,15 @@ impl Title { let shade = t::ease_out_cubic(reveal); // The world stays in view on the home page; deeper pages veil it more. let veil = if matches!(self.mode, Mode::Main) { - 0.62 + horizon_theme::HOME_VEIL } else { horizon_theme::VEIL }; + ui.muted = if matches!(self.mode, Mode::Main) { + color::MUTED + } else { + color::FAINT + }; ui.atmosphere(veil, shade); let side = t::ease_out_cubic((reveal - 0.2) / 0.7); let main = t::ease_out_cubic((reveal - 0.35) / 0.65); @@ -189,7 +194,7 @@ impl Title { skipped } fn sidebar(&self, ui: &mut Ui) { - let h = ui.h; + let (h, muted) = (ui.h, ui.muted); ui.sidebar_frame("Horizon"); ui.sidebar_list(NAV, 12.0, 72.0, SIDEBAR - 24.0, &PAGES, page(&self.mode)); let qy = h - 12.0 - 18.0 - 12.0 - CONTROL; @@ -208,19 +213,20 @@ impl Title { CONTROL, 24.0, qy, - color::mix(color::FAINT, color::TEXT, hover), + color::mix(muted, color::TEXT, hover), "Quit game", ); - ui.caps(24.0, h - 12.0 - 18.0, color::FAINT, "Horizon 26.3"); + ui.caps(24.0, h - 12.0 - 18.0, muted, "Horizon 26.3"); } /// Home: the launcher's Play page over the backdrop. fn home(&self, ui: &mut Ui, x: f32, w: f32) { - ui.wordmark(x, 260.0); + ui.wordmark(x, w, ui.h - 64.0, 220.0); + let muted = ui.muted; let mut y = 36.0 + 28.0; ui.caps( x, y, - color::FAINT, + muted, "Minecraft 26.3 · Java Edition, rewritten in Rust", ); y += 24.0; @@ -232,7 +238,7 @@ impl Title { t::LARGE, x, y, - color::FAINT, + muted, "The world you know, rebuilt from the ground up.", ); y += 22.0 + 28.0; @@ -286,7 +292,7 @@ impl Title { ui.caps( x, ui.h - 12.0 - 18.0, - color::FAINT, + muted, "Not affiliated with Mojang or Microsoft", ); } @@ -912,7 +918,7 @@ pub mod pause { let (w, h) = (ui.w, ui.h); let p = t::ease_out_quint(opened.elapsed().as_secs_f32() / t::move_()); ui.opacity = p; - ui.atmosphere(0.72, 1.0); + ui.atmosphere(horizon_theme::VEIL, 1.0); ui.offset = (-16.0 * (1.0 - p), 0.0); ui.sidebar_frame("Horizon"); ui.sidebar_list( diff --git a/crates/horizon-client/src/options_horizon.rs b/crates/horizon-client/src/options_horizon.rs index f3a591821..e97107587 100644 --- a/crates/horizon-client/src/options_horizon.rs +++ b/crates/horizon-client/src/options_horizon.rs @@ -255,7 +255,7 @@ impl OptionsUi { ) -> Vec<(Item, f32, f32)> { let (w, h) = (ui.w, ui.h); if self.in_world { - ui.atmosphere(0.72, 1.0); + ui.atmosphere(horizon_theme::VEIL, 1.0); } else { if backdrop < 1.0 { ui.cold_background(1.0 - backdrop); diff --git a/crates/horizon-client/src/ui_theme.rs b/crates/horizon-client/src/ui_theme.rs index 15a55157a..8b8a74f65 100644 --- a/crates/horizon-client/src/ui_theme.rs +++ b/crates/horizon-client/src/ui_theme.rs @@ -96,8 +96,9 @@ pub mod color { pub const TEXT: u32 = hex(P.ink, 255); /// Values and secondary text (`ink_soft`). pub const MUTED: u32 = hex(P.ink_soft, 255); - /// Labels, indices, descriptions (`muted`). - pub const FAINT: u32 = hex(P.muted, 255); + /// Labels, indices, descriptions over the veiled backdrop + /// (`horizon_theme::BACKDROP_MUTED`, which holds AA there). + pub const FAINT: u32 = hex(horizon_theme::BACKDROP_MUTED, 255); pub const ACCENT: u32 = hex(P.accent, 255); pub const ON_ACCENT: u32 = hex(P.on_accent, 255); pub const DANGER: u32 = hex(P.danger, 255); @@ -434,6 +435,9 @@ pub struct Ui<'a> { /// The number the next settings row shows (`01`, `02`…); `page_header` /// starts it again. pub row_index: usize, + /// Secondary text (indices, inactive items, captions): `FAINT`, or `MUTED` over the home + /// page's lighter veil (`horizon_theme::HOME_VEIL`). + pub muted: u32, } impl<'a> Ui<'a> { /// `cursor` is in GUI pixels, like every screen's input. @@ -464,6 +468,7 @@ impl<'a> Ui<'a> { opacity: 1.0, offset: (0.0, 0.0), row_index: 0, + muted: color::FAINT, } } /// A layout pass for hit testing: nothing is drawn and no tween starts. @@ -948,7 +953,7 @@ impl<'a> Ui<'a> { } Kind::Ghost => { self.rounded(x, y, w, h, PILL, color::with_alpha(color::RAISED, hover)); - color::mix(color::FAINT, color::TEXT, hover) + color::mix(self.muted, color::TEXT, hover) } Kind::Danger => { self.rounded(x, y, w, h, PILL, color::with_alpha(color::RAISED, hover)); @@ -1008,7 +1013,7 @@ impl<'a> Ui<'a> { let (face, fg) = if active { (Face::Medium, color::TEXT) } else { - (Face::Regular, color::mix(color::FAINT, color::TEXT, hover)) + (Face::Regular, color::mix(self.muted, color::TEXT, hover)) }; self.text_line(face, BODY, CONTROL, x + 12.0, iy, fg, label); } @@ -1042,7 +1047,7 @@ impl<'a> Ui<'a> { let fg = if active { color::BG } else { - color::mix(color::FAINT, color::TEXT, hover) + color::mix(self.muted, color::TEXT, hover) }; let lw = self.measure(Face::Medium, BODY, label); self.text_line( @@ -1079,7 +1084,8 @@ impl<'a> Ui<'a> { fn index(&mut self, x: f32, y: f32) { self.row_index += 1; let n = format!("{:02}", self.row_index); - self.text(Face::Mono, MICRO, x, y + 2.0, color::FAINT, &n); + let muted = self.muted; + self.text(Face::Mono, MICRO, x, y + 2.0, muted, &n); } /// The launcher's settings `row`: its number, a label column, then the /// value; py 12. Returns the row height (draw the action yourself, @@ -1223,18 +1229,21 @@ impl<'a> Ui<'a> { color::with_alpha(color::BG, veil * shade.max(0.0)), ); } - /// The giant faint wordmark at the foot of a screen, half set below its - /// edge. - pub fn wordmark(&mut self, x: f32, size: f32) { - let line = size.round(); - let y = self.h - line * 0.62; + /// The giant faint wordmark, whole, as wide as the column at `x` (`w` wide, at most `max` + /// tall) with its baseline at `bottom`. + pub fn wordmark(&mut self, x: f32, w: f32, bottom: f32, max: f32) { + let unit = self.measure(Face::Display, 100.0, "horizon") / 100.0; + let size = (w / unit).min(max).floor(); + // Geist's x-height glyphs sit on the baseline; its ascenders reach 0.75 em above it. + let line = (size * 1.2).round(); + let top = bottom - line * 0.5 - size * 0.36; self.text_line( Face::Display, size, line, - x - size * 0.06, - y, - color::with_alpha(color::TEXT, 0.05), + x - size * 0.05, + top, + color::with_alpha(color::TEXT, 0.06), "horizon", ); }