fix(glfw): route a drag by the row it began in, and drop stale hover state

`controller_at()` routed every pointer event by the row the pixel was in,
ignoring the row a drag started in, so a press on one figure row followed by a
motion and release in another delivered the motion and release to a controller
whose `mode_ == None`. The owning controller kept `mode_`, `drag_region_`,
`drag_cursor_` and `drag_fixed_x_` set for ever: `publish_hot()` kept publishing
the grabbed handle, `grabbed_region()` reported a drag that had ended, and a
later gesture re-entering the row resumed the stale edit from the old anchor.

`feed_pointer_event()` now owns the routing: a press captures the row it landed
in and every motion and the release until the button comes up go to that row
(`pointer_target()`), cleared on release and when another figure is set. The
GLFW callbacks build the event and call it, so a windowless host or a test can
drive the routing too.

Two neighbours in the same seam:

* `sync_figure_crosshair()` called the four-argument overload unconditionally,
  so a documented vertical-only crosshair (`horizontal == false`) was promoted
  to a full cross at the stored y == 0, clamped to the axes edge and made
  permanent; the change detection also keyed on x alone, missing a y-only move
  to another row at the same x (two rows showing one horizontal line, spec 17).
  It now consults `crosshair().horizontal` and compares the hovered row's y.
* Only the row under the pointer republished its hot handles, so a row the
  pointer left kept drawing a hovered marker or bound as if it were still
  under the pointer, and answered `hovered_region()`/`grabbed_cursor()` for
  it. The run loop clears every other row's handles, keeping the captured
  row while a drag owns the button, and reads the frame's one layout once
  instead of recomputing every row five times.

Test: a press on row A's region, a motion into row B, a release in row B
asserts no controller keeps a drag mode, nothing reports a grabbed handle, and
a later press-and-motion that re-enters row A does not resume the old edit.
This commit is contained in:
Martino Ferrari committed 2026-09-28 22:36:30 +02:00
1 parent 81792dcd05
commit 9aff06acee
3 files changed
+214 -13

No files matched your search

+86
View File
@@ -82,6 +82,92 @@ PLOT_TEST(the_host_routes_a_pixel_in_a_row_gap_to_the_nearest_row) {
}
}
// --- a drag that crosses rows is still one drag ------------------------------
namespace {
/// A two-row figure with a wide region on row 0, handed to a host: the fixture for the
/// drag capture. The region is what a drag edits, so where it ends up -- and whether the
/// owning controller still thinks it is dragging -- says whether the gesture that began on
/// it was the gesture the release ended.
struct DragRouted {
DragRouted() : figure(2u) {
figure.set_viewport({0.0f, 0.0f, 300.0f, 600.0f});
for (plot::u32 row = 0; row < 2u; ++row) {
plot::Plot& p = figure.plot(row);
p.add_x_axis({"t", {0.0, 1.0}, false, plot::AxisPlace::Bottom, false});
p.add_y_axis({"v", {-1.0, 1.0}, false, plot::AxisPlace::Left, false});
}
plot::Region region;
region.x0 = 0.25;
region.x1 = 0.75;
region.snap = plot::RegionSnap::Free; // the bounds are the test's, not a sample's
region_id = figure.plot(0u).add_region(region);
host.set_figure(&figure);
figure.layout();
}
plot::Figure figure;
plot::glfw::Host host;
plot::u32 region_id = 0u;
};
} // namespace
/// The finding: `controller_at()` routes *every* pointer event by the row the pixel is in,
/// ignoring the row a drag began in. A press on row 0's region, a motion into row 1 and a
/// release in row 1 therefore left row 0's controller with `MoveRegion`, `drag_region_`,
/// `drag_cursor_` and `drag_fixed_x_` set for ever: it kept publishing the grabbed bound,
/// `grabbed_region()` reported a drag that had ended, and a later gesture re-entering row 0
/// resumed the stale edit from the old anchor. The routing now captures the press's row for
/// the button's whole life, so the motion and the release reach the controller that owns them.
PLOT_TEST(a_drag_that_crosses_rows_is_ended_by_the_release_in_the_other_row) {
DragRouted r;
const std::vector<plot::Rect> rows = r.figure.layout().rows;
PLOT_CHECK(rows.size() == 2u);
plot::input::Controller& row0 = *r.host.row_controller(0u);
plot::input::Controller& row1 = *r.host.row_controller(1u);
// The screen x of data 0.5 on row 0's own x axis, and the middle of each row.
const plot::f32 x = static_cast<plot::f32>(r.figure.plot(0u).x_transform(0u).to_screen_x(0.5));
const plot::f32 y_a = rows[0].y + 0.5f * rows[0].h;
const plot::f32 y_b = rows[1].y + 0.5f * rows[1].h;
// Press on the region's body in row A.
r.host.feed_pointer_event({x, y_a, 0.0f, 0.0f, plot::input::Button::Left, 0u, true, true, false});
PLOT_CHECK(row0.drag_mode() == plot::input::DragMode::MoveRegion);
PLOT_CHECK(row0.grabbed_region() == r.region_id);
// Move into row B with the button still down, then release there.
r.host.feed_pointer_event(
{x + 4.0f, y_b, 4.0f, y_b - y_a, plot::input::Button::Left, 0u, true, false, false});
r.host.feed_pointer_event(
{x + 4.0f, y_b, 0.0f, 0.0f, plot::input::Button::Left, 0u, false, false, true});
// (a) No controller is left holding a drag mode -- the release ended the gesture on the
// controller that began it.
PLOT_CHECK(row0.drag_mode() == plot::input::DragMode::None);
PLOT_CHECK(row1.drag_mode() == plot::input::DragMode::None);
// (b) And nothing reports a grabbed handle any more.
PLOT_CHECK(row0.grabbed_region() == plot::kInvalid);
PLOT_CHECK(row0.grabbed_cursor() == plot::kInvalid);
PLOT_CHECK(row1.grabbed_region() == plot::kInvalid);
// (d) The region is where the release left it: the press below is in row B, so a motion
// re-entering row A must not edit it again from the old anchor. (Before the fix row A's
// stale `MoveRegion` resumed on exactly this motion and moved the region further.)
const plot::Region after = r.figure.plot(0u).region(r.region_id);
r.host.feed_pointer_event({x, y_b, 0.0f, 0.0f, plot::input::Button::Left, 0u, true, true, false});
r.host.feed_pointer_event({x + 20.0f, y_a, 20.0f, y_a - y_b, plot::input::Button::Left, 0u, true,
false, false});
r.host.feed_pointer_event(
{x + 20.0f, y_a, 0.0f, 0.0f, plot::input::Button::Left, 0u, false, false, true});
const plot::Region now = r.figure.plot(0u).region(r.region_id);
PLOT_CHECK(now.x0 == after.x0);
PLOT_CHECK(now.x1 == after.x1);
PLOT_CHECK(row0.drag_mode() == plot::input::DragMode::None);
}
PLOT_TEST(the_host_keeps_its_own_controller_while_no_figure_is_set) {
plot::glfw::Host host;
PLOT_CHECK(host.figure() == nullptr);