From d7111c7326d501acfc3684e42c565200d6415f6a Mon Sep 17 00:00:00 2001 From: Colin Faulkingham Date: Wed, 28 Oct 2026 12:16:19 +0000 Subject: [PATCH] Ribbon: keep workspace captions inside the switcher (#7931) (#7956) * claim: #7931 * Fix translated workspace captions overflowing the switcher (#7931) --- crates/ui-egui/src/toolbar.rs | 48 +++++++++++++++++-- .../tests/scenarios/ribbon_docked.json | 2 + 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs index bcdbda455..6c03cc9d6 100644 --- a/crates/ui-egui/src/toolbar.rs +++ b/crates/ui-egui/src/toolbar.rs @@ -984,6 +984,10 @@ fn ribbon_text(ui: &egui::Ui, at: egui::Pos2, text: &str, size: f32, color: Colo let text = egui::RichText::new(text).size(size).color(color); let text = if bold { text.semibold() } else { text }; let galley = egui::WidgetText::from(text).into_galley(ui, Some(egui::TextWrapMode::Extend), f32::INFINITY, egui::TextStyle::Button); + ribbon_galley(ui, at, galley, color); +} + +fn ribbon_galley(ui: &egui::Ui, at: egui::Pos2, galley: std::sync::Arc, color: Color32) { let origin = at - galley.size() / 2.0; let ppp = ui.ctx().pixels_per_point().max(0.5); let origin = pos2((origin.x * ppp).round() / ppp, (origin.y * ppp).round() / ppp); @@ -1238,9 +1242,15 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) { true, ); let label = app.tr("ui.ribbon_workspace"); - let label_width = - painter.layout_no_wrap(label.to_string(), FontId::proportional(crate::theme::Tokens::get().font_small), t.text_dim).size().x; - ribbon_text(ui, pos2(ws.center().x - 6.0, ws.top() + if labels { 89.0 } else { 70.0 }), label, t.font_small, t.text_dim, false); + // Long translations share the switcher's width with the arrow and its gap. + let galley = egui::WidgetText::from(egui::RichText::new(label).size(t.font_small).color(t.text_dim)).into_galley( + ui, + Some(egui::TextWrapMode::Truncate), + (ws.width() - 2.0 * t.space_8 - t.space_12).max(0.0), + egui::TextStyle::Button, + ); + let label_width = galley.size().x; + ribbon_galley(ui, pos2(ws.center().x - 6.0, ws.top() + if labels { 89.0 } else { 70.0 }), galley, t.text_dim); dropdown_arrow(&painter, pos2(ws.center().x - 6.0 + label_width / 2.0 + 7.0, ws.top() + if labels { 89.5 } else { 70.5 }), t.text_dim); } if wresp.on_hover_text(app.tr("ui.change_workspace")).clicked() { @@ -3326,6 +3336,38 @@ mod app_bar_tests { mod ribbon_label_tests { use super::*; + #[test] + fn translated_workspace_captions_fit_with_room_for_the_arrow() { + let mut h = crate::scenario::Harness::new(); + h.app.home.open = false; + for layout in ["floating", "compact"] { + h.call("ui.set", json!({"layout": layout})); + for labels in [true, false] { + h.app.preferences.ribbon_labels = labels; + for language in ["en", "ru", "de", "ja", "ko", "uk"] { + h.call("ui.prefs", json!({"language": language})); + h.frames(3); + let ws = crate::scenario::rect_of("workspace_switcher").unwrap(); + let caption = h.app.tr("ui.ribbon_workspace"); + let text = h + .shapes + .iter() + .find_map(|shape| match &shape.shape { + egui::Shape::Text(text) if text.galley.text() == caption => Some(text), + _ => None, + }) + .unwrap(); + let bounds = Rect::from_min_size(text.pos, text.galley.size()); + assert!(bounds.left() >= ws.left() + 4.0, "{language}, {layout}, labels={labels}: {bounds:?} outside {ws:?}"); + assert!(bounds.right() + 12.0 <= ws.right() - 4.0, "{language}, {layout}, labels={labels}: no room for the arrow"); + if language == "en" { + assert!(!text.galley.elided, "the English caption still fits whole"); + } + } + } + } + } + fn tab_test_themes() -> Vec { let mut themes = Vec::new(); for dark in [false, true] { diff --git a/crates/ui-egui/tests/scenarios/ribbon_docked.json b/crates/ui-egui/tests/scenarios/ribbon_docked.json index b66832510..49dc4b0df 100644 --- a/crates/ui-egui/tests/scenarios/ribbon_docked.json +++ b/crates/ui-egui/tests/scenarios/ribbon_docked.json @@ -1,11 +1,13 @@ [ {"note":"Docked ribbon entry points keep the existing workspace menu, section menus, command search and Sketch exit usable after resizing."}, {"expect":{"shown_handles":["ribbon:workspace","ribbon:search","ribbon:section:MODEL:CREATE","tab:MODEL"],"spans":{"inner":"ribbon:workspace","outer":"toolbar","axis":"y","tol":1}}}, + {"call":"ui.prefs","params":{"language":"ru"}}, {"click":{"handle":"ribbon:workspace"}}, {"call":"ui.menuPick","params":{"item":"ui.workspace.render"}}, {"expect":{"shown_handles":["render:stage:look","render:stage:light","render:stage:frame","render:stage:output","ribbon:search","ribbon:workspace"]}}, {"click":{"handle":"ribbon:workspace"}}, {"call":"ui.menuPick","params":{"item":"ui.workspace.design"}}, + {"call":"ui.prefs","params":{"language":"en"}}, {"click":{"handle":"ribbon:section:MODEL:CREATE"}}, {"expect":{"shown_handles":["dropdown:solid.extrude"]}}, {"key":"Escape"},