fix(client): improve candidate preview and serialize canvas image transforms
This commit is contained in:
parent
96306f9582
commit
e1ee87cf96
@ -460,28 +460,45 @@ impl ArtifactPreviewView {
|
||||
}
|
||||
}
|
||||
|
||||
fn artifact_preview_contents(ui: &mut Ui, texture: &egui::TextureHandle, view: &mut ArtifactPreviewView, height: f32) -> Rect {
|
||||
pub(super) fn image_preview_button(ui: &mut Ui, rect: Rect, key: &str) -> egui::Response {
|
||||
let button = Rect::from_min_size(rect.right_top() + vec2(-34.0, 6.0), vec2(28.0, 28.0));
|
||||
let response = preview_icon_at(ui, button, key, "maximize-2", "放大预览");
|
||||
if response.clicked() {
|
||||
ui.data_mut(|data| data.insert_temp(Id::unique("jiansun-image-expanded"), key.to_owned()));
|
||||
}
|
||||
response
|
||||
}
|
||||
|
||||
fn preview_icon_at(ui: &mut Ui, rect: Rect, key: &str, icon: &str, label: &str) -> egui::Response {
|
||||
let mut controls = ui.new_child(egui::UiBuilder::new().id_salt(("preview-control", key)).max_rect(rect)
|
||||
.layout(Layout::top_down(egui::Align::Min)));
|
||||
controls.set_clip_rect(ui.clip_rect().intersect(rect));
|
||||
let mut frame = egui::Frame::NONE.corner_radius(8).begin(&mut controls);
|
||||
let response = super::stitch_ui::icon_action_button(&mut frame.content_ui, icon, label, true, 28.0, true);
|
||||
frame.frame.fill = Color32::from_black_alpha(if response.hovered() { 230 } else { 185 });
|
||||
frame.end(&mut controls);
|
||||
response.on_hover_text(label)
|
||||
}
|
||||
|
||||
fn preview_neighbors<'a>(workflow: &'a Value, key: &str) -> (Option<&'a str>, Option<&'a str>) {
|
||||
for slot in workflow["slots"].as_array().into_iter().flatten() {
|
||||
let mut keys = slot["candidates"].as_array().into_iter().flatten()
|
||||
.filter(|candidate| candidate["status"] == "complete")
|
||||
.filter_map(|candidate| candidate.get("taskId").unwrap_or(&candidate["id"]).as_str());
|
||||
let mut previous = None;
|
||||
while let Some(candidate) = keys.next() {
|
||||
if candidate == key { return (previous, keys.next()); }
|
||||
previous = Some(candidate);
|
||||
}
|
||||
}
|
||||
(None, None)
|
||||
}
|
||||
|
||||
fn artifact_preview_contents(ui: &mut Ui, texture: &egui::TextureHandle, view: &mut ArtifactPreviewView, rect: Rect) {
|
||||
let image = texture.size_vec2();
|
||||
let viewport = rect.size();
|
||||
let pixels_per_point = ui.ctx().pixels_per_point();
|
||||
let viewport = vec2(ui.available_width(), height);
|
||||
let zoom = view.scale(viewport, image, pixels_per_point) * pixels_per_point;
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if super::stitch_ui::action_button(ui, "适应窗口", super::stitch_ui::ButtonRole::Quiet, true).clicked() {
|
||||
*view = ArtifactPreviewView::default();
|
||||
}
|
||||
if super::stitch_ui::action_button(ui, "100%", super::stitch_ui::ButtonRole::Quiet, true).clicked() {
|
||||
view.zoom_at(1.0, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
let fit = (viewport.x / image.x).min(viewport.y / image.y).min(1.0 / pixels_per_point) * pixels_per_point;
|
||||
if super::stitch_ui::icon_action_button(ui, "minus", "缩小预览", true, 28.0, zoom > fit + 0.001).on_hover_text("缩小预览").clicked() {
|
||||
view.zoom_at(zoom / 1.25, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
if super::stitch_ui::icon_action_button(ui, "plus", "放大预览", true, 28.0, zoom < 4.0).on_hover_text("放大预览").clicked() {
|
||||
view.zoom_at(zoom * 1.25, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
ui.weak(format!("{:.0}%", view.scale(viewport, image, pixels_per_point) * pixels_per_point * 100.0));
|
||||
});
|
||||
let (rect, response) = ui.allocate_exact_size(viewport, Sense::click_and_drag());
|
||||
let response = ui.interact(rect, ui.scope_id().with("preview-image"), Sense::click_and_drag());
|
||||
let response = response.on_hover_text("滚轮缩放 · 拖动查看 · 双击适应窗口");
|
||||
if response.double_clicked() { *view = ArtifactPreviewView::default(); }
|
||||
if response.hovered() && ui.is_enabled() {
|
||||
@ -525,7 +542,37 @@ fn artifact_preview_contents(ui: &mut Ui, texture: &egui::TextureHandle, view: &
|
||||
let painter = ui.painter_at(rect.intersect(ui.clip_rect()));
|
||||
painter.image(texture.id(), Rect::from_min_size(rect.center() - view.center * image * scale, image * scale),
|
||||
Rect::from_min_max(egui::Pos2::ZERO, egui::pos2(1.0, 1.0)), Color32::WHITE);
|
||||
rect
|
||||
}
|
||||
|
||||
fn artifact_preview_zoom_bar(ui: &mut Ui, texture: &egui::TextureHandle, view: &mut ArtifactPreviewView, viewport: Vec2, loading: bool) {
|
||||
let image = texture.size_vec2();
|
||||
let pixels_per_point = ui.ctx().pixels_per_point();
|
||||
let zoom = view.scale(viewport, image, pixels_per_point) * pixels_per_point;
|
||||
let fit = ArtifactPreviewView::default().scale(viewport, image, pixels_per_point) * pixels_per_point;
|
||||
let t = Tokens::get(ui.ctx()).agent();
|
||||
egui::Frame::NONE.fill(t.field).stroke(Stroke::new(1.0, t.field_border)).corner_radius(18)
|
||||
.inner_margin(egui::Margin::symmetric(8, 0)).show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
use super::stitch_ui::{ButtonRole, action_button, icon_action_button};
|
||||
ui.spacing_mut().item_spacing.x = 3.0;
|
||||
ui.spacing_mut().button_padding.x = 5.0;
|
||||
if action_button(ui, "适应窗口", ButtonRole::Quiet, true).clicked() {
|
||||
*view = ArtifactPreviewView::default();
|
||||
}
|
||||
if action_button(ui, "原始大小", ButtonRole::Quiet, true).clicked() {
|
||||
view.zoom_at(1.0, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
if icon_action_button(ui, "minus", "缩小预览", true, 28.0, zoom > fit + 0.001).on_hover_text("缩小预览").clicked() {
|
||||
view.zoom_at(zoom / 1.25, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
if icon_action_button(ui, "plus", "放大预览", true, 28.0, zoom < 4.0).on_hover_text("放大预览").clicked() {
|
||||
view.zoom_at(zoom * 1.25, Vec2::ZERO, viewport, image, pixels_per_point);
|
||||
}
|
||||
let percent = format!("{:.0}%", view.scale(viewport, image, pixels_per_point) * pixels_per_point * 100.0);
|
||||
ui.add_sized(vec2(38.0, 28.0), egui::Label::new(RichText::new(percent).weak()).truncate());
|
||||
if loading { ui.spinner(); }
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
pub(super) fn rect_value(r: Rect) -> Value {
|
||||
@ -1469,9 +1516,10 @@ impl Workspace {
|
||||
painter.rect_filled(Rect::from_min_size(pos, text.size()).expand2(vec2(5.0, 3.0)), 6.0, Color32::from_black_alpha(188));
|
||||
painter.galley(pos, text, Color32::WHITE);
|
||||
}
|
||||
let expand = (rect.width() >= 42.0 && rect.height() >= 42.0).then(|| image_preview_button(ui, rect, id));
|
||||
let response = response.on_hover_text(format!("定位 {label} · 右键查看原图"));
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("定位 {label}")));
|
||||
if response.clicked() {
|
||||
if response.clicked() && !expand.is_some_and(|button| button.clicked()) {
|
||||
locate = Some(image_location(value, id));
|
||||
}
|
||||
egui::Popup::context_menu(&response).frame(super::stitch_ui::menu_frame(ui.ctx())).show(|ui| {
|
||||
@ -1527,13 +1575,13 @@ impl Workspace {
|
||||
return;
|
||||
}
|
||||
if let Some(selected) = selected.as_ref() {
|
||||
self.agent_images.mark_visible_existing(selected);
|
||||
self.agent_images.mark_visible(selected);
|
||||
if let Some(texture) = self.agent_images.get(selected) {
|
||||
let view = snapshot.as_ref().filter(|old| old.key == *selected).map(|old| old.view.clone()).unwrap_or_default();
|
||||
let current = ArtifactPreviewSnapshot { scope, key: selected.clone(), texture: texture.clone(), view };
|
||||
ui.data_mut(|d| d.insert_temp(snapshot_id, current.clone()));
|
||||
snapshot = Some(current);
|
||||
} else {
|
||||
} else if snapshot.is_none() {
|
||||
ui.data_mut(|d| { d.remove::<ArtifactPreviewSnapshot>(snapshot_id); d.remove::<String>(id); });
|
||||
super::stitch_ui::overlay_transition(ui.ctx(), transition_id, false, true);
|
||||
return;
|
||||
@ -1549,15 +1597,49 @@ impl Workspace {
|
||||
let texture = &saved.texture;
|
||||
let screen = ui.ctx().content_rect();
|
||||
let image = texture.size_vec2();
|
||||
let factor = ((screen.width() - 100.0).max(1.0) / image.x).min((screen.height() - 220.0).max(1.0) / image.y).min(1.0);
|
||||
let fitted = image * factor;
|
||||
let closed = super::stitch_ui::dialog(ui, id.with("centered"), "生成图片", selected.is_some(), self.reduce_motion, fitted.x.max(360.0), |ui| {
|
||||
artifact_preview_contents(ui, texture, &mut saved.view, fitted.y.max(120.0));
|
||||
let available = (screen.size() - vec2(104.0, 112.0)).max(Vec2::splat(1.0));
|
||||
let viewport = image * ArtifactPreviewView::default().scale(available, image, ui.ctx().pixels_per_point());
|
||||
let (previous, next) = preview_neighbors(&self.template_workflow, &saved.key);
|
||||
let loading = selected.as_ref().is_some_and(|key| *key != saved.key);
|
||||
let mut close = false;
|
||||
let mut switch = None;
|
||||
let modal = egui::Modal::new(id.with("lightbox"))
|
||||
.frame(egui::Frame::NONE)
|
||||
.backdrop_color(Color32::from_black_alpha((208.0 * visual.opacity) as u8))
|
||||
.show(ui.ctx(), |ui| {
|
||||
let size = vec2((viewport.x + 80.0).max(260.0), viewport.y + 84.0);
|
||||
let (body, _) = ui.allocate_exact_size(size, Sense::hover());
|
||||
super::stitch_ui::overlay_contents(ui, visual, |ui| {
|
||||
let photo = Rect::from_center_size(egui::pos2(body.center().x, body.top() + 36.0 + viewport.y / 2.0), viewport);
|
||||
artifact_preview_contents(ui, texture, &mut saved.view, photo);
|
||||
let close_rect = Rect::from_min_size(body.right_top() - vec2(28.0, 0.0), Vec2::splat(28.0));
|
||||
close = preview_icon_at(ui, close_rect, "close", "x", "关闭预览").clicked();
|
||||
for (key, x, icon, label, shortcut) in [
|
||||
(previous, photo.left() - 24.0, "chevron-left", "上一张", egui::Key::ArrowLeft),
|
||||
(next, photo.right() + 24.0, "chevron-right", "下一张", egui::Key::ArrowRight),
|
||||
] {
|
||||
if let Some(key) = key {
|
||||
let rect = Rect::from_center_size(egui::pos2(x, photo.center().y), Vec2::splat(28.0));
|
||||
if preview_icon_at(ui, rect, icon, icon, label).clicked()
|
||||
|| (ui.is_enabled() && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, shortcut))) {
|
||||
switch = Some(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
let width = if loading { 274.0 } else { 252.0 };
|
||||
let bar = Rect::from_center_size(egui::pos2(photo.center().x, photo.bottom() + 29.0), vec2(width, 38.0));
|
||||
let mut controls = ui.new_child(egui::UiBuilder::new().id_salt("zoom-bar").max_rect(bar)
|
||||
.layout(Layout::top_down(egui::Align::Min)));
|
||||
artifact_preview_zoom_bar(&mut controls, texture, &mut saved.view, viewport, loading);
|
||||
});
|
||||
});
|
||||
ui.data_mut(|d| d.insert_temp(snapshot_id, saved.clone()));
|
||||
if closed {
|
||||
if visual.interactive && (close || modal.should_close()) {
|
||||
ui.data_mut(|d| d.remove::<String>(id));
|
||||
ui.ctx().request_repaint();
|
||||
} else if let Some(key) = switch {
|
||||
ui.data_mut(|d| d.insert_temp(id, key.to_owned()));
|
||||
ui.ctx().request_repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4538,10 +4620,17 @@ mod tests {
|
||||
w.reduce_motion = true;
|
||||
w.agent_images.insert("first".into(), texture.clone());
|
||||
w.agent_images.insert("second".into(), texture);
|
||||
w.template_workflow = json!({"slots":[
|
||||
{"candidates":[{"taskId":"first","status":"complete"},{"taskId":"failed","status":"failed"},{"taskId":"second","status":"complete"}]},
|
||||
{"candidates":[{"taskId":"other-slot","status":"complete"}]}
|
||||
]});
|
||||
ctx.data_mut(|d| d.insert_temp(id, "first".to_owned()));
|
||||
let frame = |time:f64, events| ctx.run_ui(egui::RawInput {
|
||||
let frame = |time:f64, events| {
|
||||
let mut output = ctx.run_ui(egui::RawInput {
|
||||
screen_rect:Some(Rect::from_min_size(egui::Pos2::ZERO,vec2(800.0,600.0))), time:Some(time), events, ..Default::default()
|
||||
}, |ui| w.artifact_window(ui));
|
||||
}, |ui| w.artifact_window(ui));
|
||||
output.textures_delta.clear();
|
||||
};
|
||||
for time in [0.0, 0.1, 0.2] { let _ = frame(time,vec![]); }
|
||||
let pos = pos2(400.0,350.0);
|
||||
let _ = frame(0.3,vec![egui::Event::PointerMoved(pos), egui::Event::MouseWheel {
|
||||
@ -4562,10 +4651,14 @@ mod tests {
|
||||
let quick = ctx.data(|d| d.get_temp::<ArtifactPreviewSnapshot>(snapshot_id)).unwrap();
|
||||
assert!(quick.view.center.x > dragged.view.center.x, "a complete drag between rendered frames still moves the preview");
|
||||
assert!(quick.view.drag_position.is_none());
|
||||
ctx.data_mut(|d| d.insert_temp(id, "second".to_owned()));
|
||||
let _ = frame(0.8,vec![]);
|
||||
let key = |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
|
||||
let _ = frame(0.8,vec![key(egui::Key::ArrowRight)]);
|
||||
let _ = frame(0.9,vec![]);
|
||||
let second = ctx.data(|d| d.get_temp::<ArtifactPreviewSnapshot>(snapshot_id)).unwrap();
|
||||
assert_eq!(second.key, "second");
|
||||
assert!(second.view.zoom.is_none());
|
||||
let _ = frame(1.0,vec![key(egui::Key::ArrowRight)]);
|
||||
assert_eq!(ctx.data(|d| d.get_temp::<String>(id)).as_deref(), Some("second"));
|
||||
assert_eq!(second.view.center, Vec2::splat(0.5));
|
||||
assert!(requests.try_recv().is_err(), "preview navigation does not dispatch generation or adoption");
|
||||
}
|
||||
@ -4581,10 +4674,11 @@ mod tests {
|
||||
w.agent_images.insert("preview".into(), texture);
|
||||
ctx.data_mut(|d| d.insert_temp(id, "preview".to_owned()));
|
||||
let frame = |time: f64, w: &Workspace| {
|
||||
ctx.run_ui(egui::RawInput {
|
||||
let mut output = ctx.run_ui(egui::RawInput {
|
||||
screen_rect: Some(Rect::from_min_size(pos2(0.0, 0.0), vec2(800.0, 600.0))),
|
||||
time: Some(time), ..Default::default()
|
||||
}, |ui| w.artifact_window(ui))
|
||||
}, |ui| w.artifact_window(ui));
|
||||
output.textures_delta.clear();
|
||||
};
|
||||
for time in [0.0, 0.1, 0.3] { let _ = frame(time, w); }
|
||||
assert!(ctx.data(|d| d.get_temp::<ArtifactPreviewSnapshot>(id.with("exit-snapshot"))).is_some());
|
||||
@ -4616,9 +4710,12 @@ mod tests {
|
||||
w.reduce_motion = false;
|
||||
w.agent_images.insert("preview".into(), texture);
|
||||
ctx.data_mut(|d| d.insert_temp(id, "preview".to_owned()));
|
||||
let frame = |time:f64, events| ctx.run_ui(egui::RawInput {
|
||||
let frame = |time:f64, events| {
|
||||
let mut output = ctx.run_ui(egui::RawInput {
|
||||
screen_rect:Some(Rect::from_min_size(egui::Pos2::ZERO,vec2(640.0,480.0))), time:Some(time), events, ..Default::default()
|
||||
}, |ui| w.artifact_window(ui));
|
||||
}, |ui| w.artifact_window(ui));
|
||||
output.textures_delta.clear();
|
||||
};
|
||||
let _ = frame(0.0,vec![]);
|
||||
let _ = frame(0.3,vec![]);
|
||||
let pos = pos2(12.0,12.0);
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
//! Native pasteboard candidates. Nothing drawn here becomes a document layer.
|
||||
use super::{json, Ui, Value, Document, Workspace, PhotocraftApp, checked_edit, LayerContent, Instant, Request, Tokens};
|
||||
use crate::canvas::ViewXform;
|
||||
use photocraft_engine::jobs::JobId;
|
||||
use egui::{Align2, Color32, FontId, Rect, Sense, Stroke, Vec2, pos2, vec2};
|
||||
use std::collections::{BTreeMap, HashMap, HashSet};
|
||||
|
||||
@ -96,6 +97,7 @@ pub(super) struct State {
|
||||
reference_cards: HashMap<(usize, String), [f32; 4]>,
|
||||
reference_drag: Option<(egui::Id, [f64; 2])>,
|
||||
direct_image_drag: Option<DirectImageDrag>,
|
||||
image_transform: Option<CanvasImageTransform>,
|
||||
pub(super) progress: HashMap<String, String>,
|
||||
selection: Vec<u64>,
|
||||
initial_focus: bool,
|
||||
@ -117,6 +119,14 @@ struct DirectImageDrag {
|
||||
bounds: [f32; 4],
|
||||
}
|
||||
|
||||
struct CanvasImageTransform {
|
||||
job: JobId,
|
||||
doc: photocraft_doc::DocId,
|
||||
revision: u64,
|
||||
layer: u64,
|
||||
queued: Option<[f64; 6]>,
|
||||
}
|
||||
|
||||
fn image_affine(scale: f64, pivot: [f64; 2], delta: [f64; 2]) -> [f64; 6] {
|
||||
[scale, 0.0, 0.0, scale, pivot[0] * (1.0 - scale) + delta[0], pivot[1] * (1.0 - scale) + delta[1]]
|
||||
}
|
||||
@ -1998,11 +2008,12 @@ impl Workspace {
|
||||
(blocked, comparison_owns_primary, pointer_on_image)
|
||||
}
|
||||
|
||||
fn paint_adopted_badge(&self, app: &PhotocraftApp, ui: &Ui, t: &Tokens, target: (&str, &str, &str, Rect, f64)) -> bool {
|
||||
fn paint_adopted_badge(&self, app: &PhotocraftApp, ui: &Ui, t: &Tokens, target: (&str, &str, &str, Rect, f64), has_preview: bool) -> bool {
|
||||
let (slot_id, variant, id, rect, now) = target;
|
||||
let adopted = app.session.active().is_some_and(|s| adopted(&s.doc, slot_id, variant) == Some(id));
|
||||
if adopted && rect.width() > 96.0 && rect.height() > 40.0 {
|
||||
let mut badge = Rect::from_min_size(rect.right_top() + vec2(-84.0, 8.0), vec2(76.0, 24.0));
|
||||
let minimum_width = if has_preview { 126.0 } else { 96.0 };
|
||||
if adopted && rect.width() > minimum_width && rect.height() > 40.0 {
|
||||
let mut badge = Rect::from_min_size(rect.right_top() + vec2(if has_preview { -118.0 } else { -84.0 }, 8.0), vec2(76.0, 24.0));
|
||||
if let Some((effect, started)) = self.canvas_workspace.adoption_effect.as_ref()
|
||||
&& effect["candidateId"] == id && effect["slotId"] == slot_id && effect["variantId"] == variant
|
||||
{
|
||||
@ -2128,12 +2139,19 @@ impl Workspace {
|
||||
if c["status"] == "unknown" { t.warning } else { t.text_dim },
|
||||
);
|
||||
}
|
||||
let adopted = self.paint_adopted_badge(app, ui, &t, (slot_id, variant, id, rect, now));
|
||||
let can_expand = has_image && rect.width() >= 42.0 && rect.height() >= 42.0
|
||||
&& visible.contains(rect.right_top() + vec2(-6.0, 6.0));
|
||||
let adopted = self.paint_adopted_badge(app, ui, &t, (slot_id, variant, id, rect, now), can_expand);
|
||||
self.paint_candidate_task_badge(ui,waiting_id,rect,c,processing,adopted);
|
||||
if response.clicked() || response.secondary_clicked() {
|
||||
let expand = can_expand.then(|| super::agent_panel::image_preview_button(ui, rect, task_id));
|
||||
if let Some(button) = &expand {
|
||||
self.canvas_workspace.geometry.insert(format!("preview:{key}"), [button.rect.min.x, button.rect.min.y, button.rect.width(), button.rect.height()]);
|
||||
}
|
||||
let locate = response.clicked() && !expand.is_some_and(|button| button.clicked());
|
||||
if locate || response.secondary_clicked() {
|
||||
let mut target = scope(row.slot, Some(c), variant, variant_label);
|
||||
target["nativeLayerId"] = json!(mapping_layer);
|
||||
if response.clicked() { result.trace_target = Some(target.clone()); }
|
||||
if locate { result.trace_target = Some(target.clone()); }
|
||||
self.canvas_workspace.context = Some(target);
|
||||
}
|
||||
if !processing && footer_height > 0.0 && (result.pointer_on_image || selected) {
|
||||
@ -2415,6 +2433,7 @@ impl Workspace {
|
||||
if modifiers != egui::Modifiers::NONE { return false; }
|
||||
// Preserve ordinary canvas navigation and let a plain click select the image.
|
||||
if ui.input(|input| input.pointer.primary_pressed()) {
|
||||
if app.session.active_job().is_some() { return true; }
|
||||
if state.active_layer != Some(photocraft_doc::LayerId(layer)) || state.selected_layers().len() != 1 {
|
||||
if let Err(error) = app.session.select_layer(photocraft_doc::LayerId(layer)) { self.error = error.to_string(); return true; }
|
||||
app.sync_mask_targets();
|
||||
@ -2440,15 +2459,62 @@ impl Workspace {
|
||||
}
|
||||
|
||||
fn commit_canvas_image_transform(&mut self, app: &mut PhotocraftApp, layer: u64, matrix: [f64; 6]) {
|
||||
if let Err(error) = app.run("edit.transform", json!({"layer":layer,"matrix":matrix})) {
|
||||
self.error = error;
|
||||
} else {
|
||||
self.draft_changed = true;
|
||||
self.sync_dirty = true;
|
||||
let Some((doc, revision)) = app.session.active().map(|state| (state.doc.id, state.revision)) else { return };
|
||||
if let Some(job) = app.session.job_on(doc) {
|
||||
if let Some(pending) = self.canvas_workspace.image_transform.as_mut()
|
||||
&& pending.job == job.id && pending.layer == layer
|
||||
{
|
||||
pending.queued = Some(match pending.queued {
|
||||
// Each direct image gesture has uniform scale and translation. Compose wheel
|
||||
// ticks about their own pointer positions in the order the user made them.
|
||||
Some(first) => [
|
||||
matrix[0] * first[0], 0.0, 0.0, matrix[3] * first[3],
|
||||
matrix[0] * first[4] + matrix[4], matrix[3] * first[5] + matrix[5],
|
||||
],
|
||||
None => matrix,
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
match app.run("edit.transform", json!({"layer":layer,"matrix":matrix})) {
|
||||
Ok(result) => {
|
||||
if let Some(job) = result["job"].as_u64() {
|
||||
self.canvas_workspace.image_transform = Some(CanvasImageTransform { job: JobId(job), doc, revision, layer, queued: None });
|
||||
} else {
|
||||
self.draft_changed = true;
|
||||
self.sync_dirty = true;
|
||||
}
|
||||
}
|
||||
Err(_) => {
|
||||
// The native command reports the desktop operation in the status bar.
|
||||
app.ui.status = "图片调整未完成,请查看画布状态后再试。".into();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn finish_canvas_image_transform(&mut self, app: &mut PhotocraftApp, doc: u64) {
|
||||
let Some(pending) = self.canvas_workspace.image_transform.as_mut() else { return };
|
||||
if pending.doc.0 != doc {
|
||||
pending.queued = None;
|
||||
return;
|
||||
}
|
||||
if app.session.job(pending.job).is_some() { return; }
|
||||
let pending = self.canvas_workspace.image_transform.take().unwrap();
|
||||
let Some(job) = app.session.jobs_with_recent().into_iter().find(|job| job.id == pending.job && job.state == "done") else { return };
|
||||
self.draft_changed = true;
|
||||
self.sync_dirty = true;
|
||||
if let Some(matrix) = pending.queued
|
||||
&& app.session.active().is_some_and(|state| {
|
||||
state.doc.id == pending.doc && state.revision == job.after_revision.unwrap_or(pending.revision + 1)
|
||||
&& state.active_layer == Some(photocraft_doc::LayerId(pending.layer))
|
||||
})
|
||||
{
|
||||
self.commit_canvas_image_transform(app, pending.layer, matrix);
|
||||
}
|
||||
}
|
||||
|
||||
fn workspace_canvas(&mut self, app: &mut PhotocraftApp, ui: &mut Ui, xf: ViewXform, doc_id: u64, width: f32) -> (bool, Option<CameraRequest>) {
|
||||
self.finish_canvas_image_transform(app, doc_id);
|
||||
self.expire_workspace_adoption(app, ui, doc_id);
|
||||
if !self.workspace_canvas_allowed(app, ui, doc_id) {
|
||||
if self.canvas_workspace.direct_image_drag.take().is_some() { app.drag = None; }
|
||||
@ -2944,6 +3010,31 @@ mod tests {
|
||||
assert_eq!(app.session.active().unwrap().doc.layers, before.layers);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn direct_image_wheel_merges_while_the_native_transform_is_busy() {
|
||||
let (mut w, mut app, _, layer, _) = native_fixture();
|
||||
warm_fixture_target(&mut app, layer);
|
||||
let doc = app.session.active().unwrap().doc.id.0;
|
||||
app.background_jobs = true;
|
||||
app.session.select_layer(photocraft_doc::LayerId(layer)).unwrap();
|
||||
w.commit_canvas_image_transform(&mut app, layer, image_affine(1.1, [50.0, 50.0], [0.0; 2]));
|
||||
let first = w.canvas_workspace.image_transform.as_ref().expect("background transform").job;
|
||||
w.commit_canvas_image_transform(&mut app, layer, image_affine(1.2, [70.0, 50.0], [0.0; 2]));
|
||||
w.commit_canvas_image_transform(&mut app, layer, image_affine(1.3, [80.0, 50.0], [0.0; 2]));
|
||||
assert!(w.error.is_empty(), "normal overlapping wheel input never becomes an Agent error");
|
||||
assert!(!w.draft_changed, "dispatch alone does not persist an edit");
|
||||
app.session.wait_job(first).unwrap();
|
||||
w.finish_canvas_image_transform(&mut app, doc);
|
||||
let second = w.canvas_workspace.image_transform.as_ref().expect("coalesced transform").job;
|
||||
assert_ne!(first, second);
|
||||
app.session.wait_job(second).unwrap();
|
||||
w.finish_canvas_image_transform(&mut app, doc);
|
||||
assert!(w.canvas_workspace.image_transform.is_none() && w.draft_changed && w.sync_dirty);
|
||||
let state = app.session.active().unwrap();
|
||||
let LayerContent::Smart(image) = &state.doc.layer(photocraft_doc::LayerId(layer)).unwrap().content else { panic!("image layer") };
|
||||
assert!((image.transform.m[0] - 1.1 * 1.2 * 1.3).abs() < 0.0001);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn processing_target_stays_bound_to_the_submitted_scope_not_the_new_selection() {
|
||||
let target = json!({"kind":"slot","slotId":"original","productVariantId":"wood","outputId":"detail"});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user