From ed9f2d0facf234652048a5735aa6731b92b2da37 Mon Sep 17 00:00:00 2001 From: Belligerently Date: Wed, 4 Nov 2026 21:04:56 -0500 Subject: [PATCH] Make the full node-search result row clickable --- crates/ui-egui/src/graph_view.rs | 1 + crates/ui-egui/tests/common/search.rs | 40 +++++++++++++++++++++++++ crates/ui-egui/tests/search_rows.rs | 43 +++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 crates/ui-egui/tests/common/search.rs create mode 100644 crates/ui-egui/tests/search_rows.rs diff --git a/crates/ui-egui/src/graph_view.rs b/crates/ui-egui/src/graph_view.rs index ee877da..349df77 100644 --- a/crates/ui-egui/src/graph_view.rs +++ b/crates/ui-egui/src/graph_view.rs @@ -1117,6 +1117,7 @@ fn search_popup(app: &mut MaterialCraftApp, ui: &mut Ui, cam: &Cam) { for (i, d) in list.iter().enumerate().take(60) { let r = ui.add( egui::Button::selectable(i == s.sel, format!("{} ", d.label)) + .min_size(vec2(ui.available_width(), 0.0)) .right_text(egui::RichText::new(d.group()).size(10.0).color(tk.text_dim)), ); if i == s.sel && (up || down) { diff --git a/crates/ui-egui/tests/common/search.rs b/crates/ui-egui/tests/common/search.rs new file mode 100644 index 0000000..63735d7 --- /dev/null +++ b/crates/ui-egui/tests/common/search.rs @@ -0,0 +1,40 @@ +use egui::{Event, Pos2, Rect, epaint::Shape, vec2}; +use egui_kittest::Harness; +use materialcraft_ui_egui::{MaterialCraftApp, UiState}; + +pub fn harness(render: bool) -> Harness<'static, MaterialCraftApp> { + let app = MaterialCraftApp::headless(materialcraft_engine::new_session(), UiState::default()); + let builder = Harness::builder().with_size(vec2(1600.0, 960.0)).with_step_dt(1.0 / 60.0); + let builder = if render { builder.wgpu() } else { builder }; + let mut h = builder.build_ui_state( + |ui, app: &mut MaterialCraftApp| { + app.step(&ui.ctx().clone()); + app.draw(ui); + }, + app, + ); + h.run_steps(8); + let pointer = h.state().graph.view.center(); + h.event(Event::PointerMoved(pointer)); + h.step(); + h.key_press(egui::Key::Tab); + h.step(); + h.run_steps(3); + assert!(h.ctx.memory(|m| m.area_rect(egui::Id::unique("node-search"))).is_some()); + assert!(label_position(&h, "Bitmap").is_some(), "fresh search must show its first result"); + h +} + +pub fn label_position(h: &Harness<'static, MaterialCraftApp>, label: &str) -> Option { + let popup = h.ctx.memory(|m| m.area_rect(egui::Id::unique("node-search"))).unwrap(); + fn find(shape: &Shape, clip: Rect, popup: Rect, label: &str) -> Option { + match shape { + Shape::Text(t) if clip.contains(t.pos) && popup.contains(t.pos) && t.galley.text().trim() == label => { + Some(t.pos + vec2(0.0, t.galley.size().y * 0.5)) + } + Shape::Vec(v) => v.iter().find_map(|s| find(s, clip, popup, label)), + _ => None, + } + } + h.output().shapes.iter().find_map(|s| find(&s.shape, s.clip_rect, popup, label)) +} diff --git a/crates/ui-egui/tests/search_rows.rs b/crates/ui-egui/tests/search_rows.rs new file mode 100644 index 0000000..5f25bbb --- /dev/null +++ b/crates/ui-egui/tests/search_rows.rs @@ -0,0 +1,43 @@ +//! Clicking anywhere across a search result's row should insert that result. +#[path = "common/search.rs"] +mod search; +use egui::{Event, Modifiers, PointerButton, Pos2, pos2, vec2}; +use egui_kittest::Harness; +use materialcraft_ui_egui::MaterialCraftApp; + +fn right_side(h: &Harness<'static, MaterialCraftApp>) -> Pos2 { + let y = search::label_position(h, "Bitmap").unwrap().y; + let popup = h.ctx.memory(|m| m.area_rect(egui::Id::unique("node-search"))).unwrap(); + pos2(popup.right() - 24.0, y) +} +fn click(h: &mut Harness<'static, MaterialCraftApp>, pos: Pos2) { + h.event(Event::PointerMoved(pos)); + h.step(); + for pressed in [true, false] { + h.event(Event::PointerButton { pos, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }); + h.step(); + } + h.run_steps(3); +} +#[test] +fn clicking_label_or_right_side_inserts_the_same_result() { + for right in [false, true] { + let mut h = search::harness(false); + let pos = if right { right_side(&h) } else { search::label_position(&h, "Bitmap").unwrap() + vec2(8.0, 0.0) }; + click(&mut h, pos); + let graph = h.state().session.graph().unwrap(); + assert_eq!(graph.nodes.len(), 1, "row click did not insert a node (right_side={right})"); + assert_eq!(graph.nodes[0].def, "bitmap"); + } +} +#[test] +#[ignore = "requires an offscreen GPU"] +fn full_width_result_screenshot() { + let mut h = search::harness(true); + let pos = right_side(&h); + h.event(Event::PointerMoved(pos)); + h.run_steps(3); + let dir = std::path::PathBuf::from(std::env::var_os("MC_SNAPSHOT_DIR").expect("set MC_SNAPSHOT_DIR")); + std::fs::create_dir_all(&dir).unwrap(); + h.render().unwrap().save(dir.join("full-width-search-result.png")).unwrap(); +}