From 4a6c0d82d703d4eba63fd2f408fa13ef0cc5ee3d Mon Sep 17 00:00:00 2001 From: David Mann Date: Tue, 27 Oct 2026 16:43:34 +0100 Subject: [PATCH] Integration: rustfmt the Character panel's preset menu after main's craft_ui::ComboBox switch (#3558) Main's #9849 bans egui::ComboBox; the preset menu #3558 added now uses craft_ui::ComboBox, three characters past rustfmt's 160-column limit. Co-Authored-By: Claude Opus 5.5 (1M context) --- crates/ui-egui/src/tools/type_tool/panel.rs | 42 +++++++++++---------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/crates/ui-egui/src/tools/type_tool/panel.rs b/crates/ui-egui/src/tools/type_tool/panel.rs index 4388096863..7211b17f3d 100644 --- a/crates/ui-egui/src/tools/type_tool/panel.rs +++ b/crates/ui-egui/src/tools/type_tool/panel.rs @@ -166,29 +166,31 @@ fn metric_field( } let near = |p: f32| (p * u - value).abs() <= 1e-4 * value.abs().max(1.0); let (press, close) = crate::press_menu::PressCombo::before(ui, menu); - let combo = - craft_ui::ComboBox::from_id_salt(menu).selected_text("").width(combo_w).height(420.0).icon(crate::widgets::chevron_icon).close_behavior(close).show_ui( - ui, - |ui| { - if let Some(on) = auto { - let item = ui.selectable_label(on, tl!("Auto")); + let combo = craft_ui::ComboBox::from_id_salt(menu) + .selected_text("") + .width(combo_w) + .height(420.0) + .icon(crate::widgets::chevron_icon) + .close_behavior(close) + .show_ui(ui, |ui| { + if let Some(on) = auto { + let item = ui.selectable_label(on, tl!("Auto")); + if press.chosen(ui, &item) { + chosen = Some(MetricChoice::Auto); + } + } + for (i, group) in presets.iter().enumerate() { + if i > 0 { + ui.separator(); + } + for &p in *group { + let item = ui.selectable_label(auto != Some(true) && near(p), preset_label(p * u, unit)); if press.chosen(ui, &item) { - chosen = Some(MetricChoice::Auto); + chosen = Some(MetricChoice::Preset(p)); } } - for (i, group) in presets.iter().enumerate() { - if i > 0 { - ui.separator(); - } - for &p in *group { - let item = ui.selectable_label(auto != Some(true) && near(p), preset_label(p * u, unit)); - if press.chosen(ui, &item) { - chosen = Some(MetricChoice::Preset(p)); - } - } - } - }, - ); + } + }); press.after(&combo.response); combo.response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, ui.is_enabled(), tl!(menu))); });