From 8212c1a805cbad9790847ba41ab241ce33ff3c22 Mon Sep 17 00:00:00 2001 From: Katacc Date: Wed, 21 Oct 2026 16:56:50 +0300 Subject: [PATCH] Status bar: keep the save message clear of a long language name The transient message ("Saved") was painted at a fixed x of 290, so "English (United States) (not checked)" ran under it. The language and the message now each start at their usual column or after the item before them, and the message is clipped before the controls on the right. Co-Authored-By: Claude Opus 5.5 --- crates/ui-egui/src/status.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/status.rs b/crates/ui-egui/src/status.rs index d5d03cdf1..88d1be3d8 100644 --- a/crates/ui-egui/src/status.rs +++ b/crates/ui-egui/src/status.rs @@ -19,22 +19,28 @@ pub fn status_bar(app: &mut SlideApp, ui: &mut Ui) { _ => "Slide Master".to_string(), }; let p = ui.painter(); - p.text(pos2(rect.min.x + 14.0, rect.center().y), Align2::LEFT_CENTER, &left, theme::font(12.0), t.text_dim); + // Left to right: slide counter, language, status message. Each starts at its usual column, or + // after the one before it when that runs long ("Slide 100 of 120", "… (not checked)"). + let sr = p.text(pos2(rect.min.x + 14.0, rect.center().y), Align2::LEFT_CENTER, &left, theme::font(12.0), t.text_dim); // The selection's proofing language; a click opens Review › Language. let (lang, no_proof) = crate::dialogs::selected_language(app); let name = crate::squiggles::lang_name(&lang) + if no_proof { " (not checked)" } else { "" }; - let lr = p.text(pos2(rect.min.x + 120.0, rect.center().y), Align2::LEFT_CENTER, &name, theme::font(12.0), t.text_dim); + let lx = (rect.min.x + 120.0).max(sr.max.x + 16.0); + let lr = p.text(pos2(lx, rect.center().y), Align2::LEFT_CENTER, &name, theme::font(12.0), t.text_dim); if ui.interact(lr.expand(3.0), ui.id().with("status_lang"), Sense::click()).on_hover_text("Language").clicked() { app.dialog = Some(crate::dialogs::Dialog::new("language")); } - // Transient status message. + // Transient status message, clipped before the controls on the right. + let right_x = rect.max.x - 560.0; if let Some(msg) = app.fresh_status() { - p.text(pos2(rect.min.x + 290.0, rect.center().y), Align2::LEFT_CENTER, &msg, theme::font(12.0), t.accent); + let mx = (rect.min.x + 290.0).max(lr.max.x + 16.0); + let clip = Rect::from_min_max(pos2(mx, rect.min.y), pos2(right_x.max(mx), rect.max.y)); + p.with_clip_rect(clip).text(pos2(mx, rect.center().y), Align2::LEFT_CENTER, &msg, theme::font(12.0), t.accent); ui.ctx().request_repaint_after(std::time::Duration::from_millis(500)); } let mut right = ui.new_child( egui::UiBuilder::new() - .max_rect(Rect::from_min_max(pos2(rect.max.x - 560.0, rect.min.y), pos2(rect.max.x - 8.0, rect.max.y))) + .max_rect(Rect::from_min_max(pos2(right_x, rect.min.y), pos2(rect.max.x - 8.0, rect.max.y))) .layout(egui::Layout::right_to_left(egui::Align::Center)), ); right.spacing_mut().item_spacing.x = 4.0;