sorokin.oleg.edu/ARCADIA-Studio
1
0
Fork 0
Code Issues 37 Pull Requests 2 Packages Projects Releases 9 Wiki Activity

Integrate persistent canvas controls with scenario lifetime rendering

Browse Source
This commit is contained in:
Codex-ytr83r
2026-09-11 12:44:06 -07:00
parent 32334c6631
commit a57c334b30
42 changed files with 11751 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oa-desktop/src/behavior/scenario_lifecycle/render.rs
+21 -6
View File
@@ -277,7 +277,13 @@ impl Rendering {
}
}
pub(in crate::behavior) fn draw_markers(&self, frame: &mut Frame, selected: Id, scale: f32) {
pub(in crate::behavior) fn draw_markers(
&self,
frame: &mut Frame,
selected: Id,
scale: f32,
pan: iced::Vector,
) {
for marker in &self.markers {
let color = if selected == marker.event.occurrence || selected == marker.lifeline {
style::TEAL
@@ -302,10 +308,11 @@ impl Rendering {
},
),
);
if let Some(clip) = birth_label_clip(marker.capsule, scale, frame.size()) {
if let Some(clip) = birth_label_clip(pan, marker.capsule, scale, frame.size()) {
// WGPU clipped frames start with an identity transform;
// neither the parent's scale nor its clip is inherited.
// neither the parent's pan/scale nor its clip is inherited.
frame.with_clip(clip, |label| {
label.translate(pan);
label.scale(scale);
label.fill_text(Text {
content: short(&marker.name, 18),
@@ -330,12 +337,20 @@ impl Rendering {
}
}
fn birth_label_clip(capsule: Rectangle, scale: f32, viewport: Size) -> Option<Rectangle> {
if !scale.is_finite() || scale <= 0. {
fn birth_label_clip(
pan: iced::Vector,
capsule: Rectangle,
scale: f32,
viewport: Size,
) -> Option<Rectangle> {
if !pan.x.is_finite() || !pan.y.is_finite() || !scale.is_finite() || scale <= 0. {
return None;
}
Rectangle::new(
Point::new((capsule.x + 8.) * scale, (capsule.y + 4.) * scale),
Point::new(
pan.x + (capsule.x + 8.) * scale,
pan.y + (capsule.y + 4.) * scale,
),
Size::new((capsule.width - 16.) * scale, (capsule.height - 8.) * scale),
)
.intersection(&Rectangle::new(Point::ORIGIN, viewport))
crates/oa-desktop/src/behavior/scenario_lifecycle/render_tests.rs
+189 -12
View File
@@ -194,9 +194,13 @@ fn real_scene_long_header_title_and_detail_keep_names_and_have_bounded_clips() {
// Scroll offset is handled by the existing outer canvas/scrollable;
// these are the local drawing frame's coordinates, not screen input.
for scale in [0.05, 0.5, 0.512, 0.64, 0.8, 1., 1.953125, 2.] {
let clip =
crate::behavior::box_text_clip(header.rect, scale, Size::new(2000., 2000.))
.unwrap();
let clip = crate::behavior::box_text_clip(
iced::Vector::ZERO,
header.rect,
scale,
Size::new(2000., 2000.),
)
.unwrap();
let world = Rectangle::new(
Point::new(clip.x / scale, clip.y / scale),
Size::new(clip.width / scale, clip.height / scale),
@@ -221,11 +225,12 @@ fn box_text_clip_intersects_parent_viewport_and_rejects_empty_interiors() {
use crate::behavior::box_text_clip;
let card = Rectangle::new(Point::new(100., 200.), Size::new(204., 70.));
assert_eq!(
box_text_clip(card, 2., Size::new(300., 500.)),
box_text_clip(iced::Vector::ZERO, card, 2., Size::new(300., 500.)),
Some(Rectangle::new(Point::new(220., 416.), Size::new(80., 84.)))
);
assert_eq!(
box_text_clip(
iced::Vector::ZERO,
Rectangle::new(Point::new(-20., -10.), card.size()),
2.,
Size::new(300., 500.),
@@ -233,14 +238,22 @@ fn box_text_clip_intersects_parent_viewport_and_rejects_empty_interiors() {
Some(Rectangle::new(Point::ORIGIN, Size::new(300., 104.)))
);
for viewport in [Size::new(200., 500.), Size::new(300., 400.), Size::ZERO] {
assert_eq!(box_text_clip(card, 2., viewport), None);
assert_eq!(box_text_clip(iced::Vector::ZERO, card, 2., viewport), None);
}
for scale in [0., -1., f32::NAN, f32::INFINITY] {
assert_eq!(box_text_clip(card, scale, Size::new(1000., 1000.)), None);
assert_eq!(
box_text_clip(iced::Vector::ZERO, card, scale, Size::new(1000., 1000.)),
None
);
}
for size in [Size::new(20., 70.), Size::new(204., 16.), Size::ZERO] {
assert_eq!(
box_text_clip(Rectangle::new(Point::ORIGIN, size), 1., card.size()),
box_text_clip(
iced::Vector::ZERO,
Rectangle::new(Point::ORIGIN, size),
1.,
card.size()
),
None
);
}
@@ -304,7 +317,8 @@ fn birth_label_clip_keeps_padded_world_bounds_at_each_scene_scale() {
Rectangle::new(Point::new(216., 408.), Size::new(248., 40.)),
),
] {
let clip = birth_label_clip(capsule, scale, Size::new(1000., 1000.)).unwrap();
let clip =
birth_label_clip(iced::Vector::ZERO, capsule, scale, Size::new(1000., 1000.)).unwrap();
for (actual, expected) in [
(clip.x, expected.x),
(clip.y, expected.y),
@@ -325,20 +339,28 @@ fn birth_label_clip_keeps_padded_world_bounds_at_each_scene_scale() {
fn birth_label_clip_preserves_parent_viewport_bounds() {
let capsule = Rectangle::new(Point::new(100., 200.), Size::new(140., 28.));
assert_eq!(
birth_label_clip(capsule, 2., Size::new(300., 420.)),
birth_label_clip(iced::Vector::ZERO, capsule, 2., Size::new(300., 420.)),
Some(Rectangle::new(Point::new(216., 408.), Size::new(84., 12.)))
);
let crossing_origin = Rectangle::new(Point::new(-20., -10.), Size::new(140., 28.));
assert_eq!(
birth_label_clip(crossing_origin, 2., Size::new(300., 420.)),
birth_label_clip(
iced::Vector::ZERO,
crossing_origin,
2.,
Size::new(300., 420.)
),
Some(Rectangle::new(Point::ORIGIN, Size::new(224., 28.)))
);
for viewport in [Size::new(200., 420.), Size::new(300., 400.), Size::ZERO] {
assert_eq!(birth_label_clip(capsule, 2., viewport), None);
assert_eq!(
birth_label_clip(iced::Vector::ZERO, capsule, 2., viewport),
None
);
}
for scale in [0., -1., f32::NAN, f32::INFINITY] {
assert_eq!(
birth_label_clip(capsule, scale, Size::new(1000., 1000.)),
birth_label_clip(iced::Vector::ZERO, capsule, scale, Size::new(1000., 1000.)),
None
);
}
@@ -794,3 +816,158 @@ fn real_scene_lifecycle_edit_undo_redo_restores_exact_source_and_changed_geometr
assert!(!document.can_redo());
}
}
#[test]
fn panned_header_and_create_clips_use_screen_translation_and_actual_viewport() {
use crate::behavior::box_text_clip;
use iced::Vector;
let header = Rectangle::new(Point::new(100., 200.), Size::new(204., 70.));
let capsule = Rectangle::new(header.position(), Size::new(140., 28.));
let rect = |x, y, w, h| Rectangle::new(Point::new(x, y), Size::new(w, h));
for (pan, scale, viewport, header_expected, birth_expected) in [
(
Vector::new(37., -41.),
0.5,
Size::new(300., 400.),
rect(92., 63., 92., 27.),
rect(91., 61., 62., 10.),
),
(
Vector::new(37., -41.),
1.,
Size::new(300., 400.),
rect(147., 167., 153., 54.),
rect(145., 163., 124., 20.),
),
(
Vector::new(37., -41.),
2.,
Size::new(300., 400.),
rect(257., 375., 43., 25.),
rect(253., 367., 47., 33.),
),
(
Vector::new(-200., -400.),
2.,
Size::new(300., 100.),
rect(20., 16., 280., 84.),
rect(16., 8., 248., 40.),
),
(
Vector::new(-237., -411.),
2.,
Size::new(300., 100.),
rect(0., 5., 300., 95.),
rect(0., 0., 227., 37.),
),
] {
assert_eq!(
box_text_clip(pan, header, scale, viewport),
Some(header_expected)
);
assert_eq!(
birth_label_clip(pan, capsule, scale, viewport),
Some(birth_expected)
);
}
for pan in [
Vector::new(1000., 1000.),
Vector::new(-1000., -1000.),
Vector::new(f32::NAN, 0.),
Vector::new(0., f32::INFINITY),
] {
assert_eq!(box_text_clip(pan, header, 2., Size::new(300., 100.)), None);
assert_eq!(
birth_label_clip(pan, capsule, 2., Size::new(300., 100.)),
None
);
}
}
#[test]
fn real_scene_panned_zoomed_program_keeps_header_birth_and_death_hit_identity() {
use crate::{
app::Message,
behavior::{
SequenceInput,
scenario::{CanvasEvent, CanvasTool},
},
};
use iced::{Vector, mouse, widget::canvas};
for layer in [Layer::Oa, Layer::Sa] {
let mut f = Fixture::new(layer);
f.project.elements.get_mut(&f.receiver).unwrap().name = "界".repeat(24);
let create = f.message(f.owner, MessageKind::Create);
let delete = f.message(f.owner, MessageKind::Delete);
let document = f.document();
let before = document.snapshot();
for scale in [0.5, 1., 2.] {
for pan in [Vector::new(35., 40.), Vector::new(-35., -5.)] {
let mut scene = f.scene();
scene.scale = scale;
scene.camera_pan = pan;
let context = crate::behavior::scenario::direct_tests::context(f.owner);
scene.interaction = Some((context, CanvasTool::Select, true));
let header = scene.boxes.iter().find(|b| b.id == f.sender).unwrap();
let targets = [
(f.sender, header.rect.center()),
(
create,
scene
.lifecycle
.markers
.iter()
.find(|m| m.event.occurrence == create)
.unwrap()
.center,
),
(
delete,
scene
.lifecycle
.markers
.iter()
.find(|m| m.event.occurrence == delete)
.unwrap()
.center,
),
];
// Absolute widget origin models the outer layout/scroll translation;
// camera pan remains local screen units and must be subtracted once.
let bounds = Rectangle::new(Point::new(73., 119.), Size::new(2000., 1200.));
for (expected, world) in targets {
let screen =
bounds.position() + pan + Vector::new(world.x * scale, world.y * scale);
assert!(bounds.contains(screen));
let mut state = SequenceInput::default();
let mut published = Vec::new();
for event in [
mouse::Event::CursorMoved { position: screen },
mouse::Event::ButtonPressed(mouse::Button::Left),
mouse::Event::ButtonReleased(mouse::Button::Left),
] {
if let Some(message) = canvas::Program::update(
&scene,
&mut state,
&canvas::Event::Mouse(event),
bounds,
mouse::Cursor::Available(screen),
)
.and_then(|a| a.into_inner().0)
{
published.push(message);
}
}
assert!(
matches!(published.as_slice(), [Message::ScenarioCanvas(CanvasEvent::Select(actual_context, actual))] if *actual_context == context && *actual == expected),
"Pan/zoom must retain the typed hit identity"
);
}
assert_eq!(scene.lifecycle, f.scene().lifecycle);
}
}
assert_eq!(document.project(), &before.decoded.project);
assert_eq!(document.bundle(), &before.bundle);
assert!(!document.can_undo() && !document.dirty());
}
}