mirror of
https://github.com/storytold/soundcraft.git
synced 2026-10-29 13:06:49 -06:00
Gary GunnandClaude Haiku 5.5
4c7ffc5f03
The clip menu was attached at the end of lane_interaction, which returns early when the lane has no pointer position. Once the menu opened, the pointer sat over the popup, the lane lost its hover, and the menu was never drawn again, so it vanished before Delete could be clicked. Attach the menu before the early return and remember the right-clicked clip so it keeps its target. Stale clip ids are dropped if the clip no longer exists. Adds a kittest regression test covering right-click, move onto the menu, and Delete. Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
67 lines
2.5 KiB
Rust
67 lines
2.5 KiB
Rust
//! Regression: the clip context menu must stay open while the pointer moves onto it, so its
|
|
//! Delete item can be used. It used to vanish once the pointer left the lane, because the lane
|
|
//! returned early (no hover position) before the menu was drawn.
|
|
|
|
use egui::{Event, Modifiers, PointerButton, pos2, vec2};
|
|
use egui_kittest::Harness;
|
|
use soundcraft_ui_egui::{Services, SoundApp};
|
|
|
|
/// One UI frame, with queued synthetic pointer input applied first (as the control channel does).
|
|
fn step(h: &mut Harness<'_, SoundApp>) {
|
|
let mut raw = std::mem::take(h.input_mut());
|
|
h.state_mut().raw_input_hook(&mut raw);
|
|
*h.input_mut() = raw;
|
|
h.step();
|
|
}
|
|
|
|
fn press(h: &mut Harness<'_, SoundApp>, x: f32, y: f32, button: PointerButton) {
|
|
let pos = pos2(x, y);
|
|
let s = &mut h.state_mut().synthetic;
|
|
s.push(Event::PointerMoved(pos));
|
|
s.push(Event::PointerButton { pos, button, pressed: true, modifiers: Modifiers::NONE });
|
|
s.push(Event::PointerButton { pos, button, pressed: false, modifiers: Modifiers::NONE });
|
|
}
|
|
|
|
fn kick_clip_count(h: &Harness<'_, SoundApp>) -> usize {
|
|
let s = h.state().engine.session();
|
|
s.tracks.iter().find(|t| t.name == "Kick").map_or(0, |t| t.clips().len())
|
|
}
|
|
|
|
#[test]
|
|
fn clip_menu_stays_open_while_moving_onto_delete() {
|
|
let engine = soundcraft_engine::demo::demo_engine();
|
|
let app = SoundApp::new(engine, None, Services::default());
|
|
let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).with_pixels_per_point(2.0).build_ui_state(
|
|
|ui, app: &mut SoundApp| {
|
|
let ctx = ui.ctx().clone();
|
|
app.logic(&ctx);
|
|
app.ui(ui);
|
|
},
|
|
app,
|
|
);
|
|
for _ in 0..6 {
|
|
step(&mut h);
|
|
}
|
|
let before = kick_clip_count(&h);
|
|
assert!(before > 0, "the demo session should have a recorded Kick clip");
|
|
|
|
// Right-click the Kick clip, then move the pointer into the menu and down to Delete.
|
|
press(&mut h, 880.0, 240.0, PointerButton::Secondary);
|
|
for _ in 0..10 {
|
|
step(&mut h);
|
|
}
|
|
// Move (no click) into the menu, as a real pointer would, so the lane loses its hover.
|
|
for (x, y) in [(900.0, 300.0), (907.0, 442.0)] {
|
|
h.state_mut().synthetic.push(Event::PointerMoved(pos2(x, y)));
|
|
for _ in 0..10 {
|
|
step(&mut h);
|
|
}
|
|
}
|
|
press(&mut h, 907.0, 442.0, PointerButton::Primary);
|
|
for _ in 0..15 {
|
|
step(&mut h);
|
|
}
|
|
|
|
assert_eq!(kick_clip_count(&h), before - 1, "clicking Delete in the clip menu should remove the clip");
|
|
}
|