EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge #2171: Settings: fit translated page names in the sidebar (#2034) (@Maokus)
aionggcf54196ad9ca
diff --cc crates/ui-egui/src/panels/settings.rsindex 6954e1377,a386367d5..b84d65d7c--- a/crates/ui-egui/src/panels/settings.rs+++ b/crates/ui-egui/src/panels/settings.rs@@@ -674,11 -679,13 +679,13 @@@ pub fn show(app: &mut EffectcraftApp, c} else if resp.hovered() {ui.painter().rect_filled(r, 3.0, t.hover);}- ui.painter().text(+ crate::widgets::text_fit(+ ui.painter(),r.left_center() + vec2(10.0, 0.0),egui::Align2::LEFT_CENTER,- tr(p.title),+ crate::i18n::settings_page_title(p.title),Tokens::ui(12.5),+ (page_width - 20.0).max(0.0),if sel { Color32::WHITE } else { t.text },);app.auto.add(&format!("settings.page.{}", p.id), r, p.title);diff --cc crates/ui-egui/tests/it/ui_scrolling.rsindex a0bc1fe67,85cca07f3..18f7012da--- a/crates/ui-egui/tests/it/ui_scrolling.rs+++ b/crates/ui-egui/tests/it/ui_scrolling.rs@@@ -236,3 -165,22 +238,27 @@@ fn settings_dialog_does_not_scroll_sideh.run_steps(20);assert_eq!((rect(&h, "settings.ok"), rect(&h, "settings.page.general")), (ok, page), "nothing moved sideways");}++ /// #2034: the Settings sidebar uses the translated page names when deciding its width.+ #[test]+ fn settings_page_column_fits_japanese_names() {+ use effectcraft_ui_egui::theme::Tokens;++ let mut session = Session::default();+ session.prefs.general.language = "ja".into();+ let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).build_eframe(|_| EffectcraftApp::new(session));+ h.run_steps(3);+ let ctx = h.ctx.clone();+ effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "app.settings", json!({"page": "scripting"})).unwrap();+ h.run_steps(3);+- let name = "スクリプトとエクスプレッション";- let text_width = h.ctx.fonts_mut(|fonts| fonts.layout_no_wrap(name.into(), Tokens::ui(12.5), egui::Color32::WHITE).size().x);++ // The panel titles a page with its Settings menu row, minus the ellipsis.++ let name = effectcraft_ui_egui::menus::menu_items(h.state())++ .into_iter()++ .find(|m| m.id == "app.settings" && m.params["page"] == "scripting")++ .and_then(|m| m.label.strip_suffix("...").map(str::to_owned))++ .expect("the Settings menu lists the Scripting & Expressions page");++ let text_width = h.ctx.fonts_mut(|fonts| fonts.layout_no_wrap(name.clone(), Tokens::ui(12.5), egui::Color32::WHITE).size().x);+ let row = rect(&h, "settings.page.scripting");+ assert!(row.width() >= text_width + 20.0, "{name} needs {text_width} points; row is {row:?}");+ }