From 21860d7ea38c0e6cf30973a43bc8569e1e239b0e Mon Sep 17 00:00:00 2001 From: WuYongJie <549727955@qq.com> Date: Mon, 16 Nov 2026 17:06:25 +0800 Subject: [PATCH] feat(client): animate image slot tabs and keep generation entry --- .../ui-egui/src/jiansun/canvas_workspace.rs | 221 ++++++++++++++---- .../crates/ui-egui/src/jiansun/stitch_ui.rs | 134 ++++++++++- 2 files changed, 294 insertions(+), 61 deletions(-) diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs index 2b0cef6d..f887a6ab 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs @@ -1,5 +1,6 @@ //! 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 super::stitch_ui::{self as kit, BadgeKind}; use crate::canvas::ViewXform; use photocraft_engine::jobs::JobId; use egui::{Align2, Color32, FontId, Rect, Sense, Stroke, Vec2, pos2, vec2}; @@ -111,6 +112,7 @@ pub(super) struct State { adoption_snapshot: Option, compare: CompareState, candidate_menu: Option, + candidate_tab_page: Option, } #[derive(Clone, Copy)] @@ -439,9 +441,6 @@ fn world_rect(xf: ViewXform, r: [f32; 4]) -> Rect { fn card_size(row: &Row) -> [f32; 2] { let max_height = (row.page_height - HEADER - 70.0).max(80.0); - if candidates(row.slot).is_empty() { - return [CARD_WIDTH, max_height.min(360.0)]; - } let ratio = frame(row).map_or(1.0, |f| f[2] / f[3]).clamp(0.05, 20.0); let height = (CARD_WIDTH / ratio).min(max_height); [height * ratio, height] @@ -459,6 +458,21 @@ fn candidate_group(row: &Row, width: f32, count: usize) -> [f32; 4] { [first[0] - GROUP_PAD, first[1] - GROUP_PAD, last[0] + last[2] - first[0] + 2.0 * GROUP_PAD, first[3] + 2.0 * GROUP_PAD] } +fn fit_tag_selection(xf: ViewXform, field: [f32; 4], candidate: [f32; 4], ppp: f32) -> Option { + let visible = xf.rect.shrink(32.0); + if visible.contains_rect(world_rect(xf, field)) && xf.rect.intersects(world_rect(xf, candidate)) { + return None; + } + let unit_view = ViewXform { zoom: 1.0, ..xf }; + let bounds = world_rect(unit_view, field).union(world_rect(unit_view, candidate)); + let center = unit_view.to_doc(bounds.center()); + let zoom = (visible.width() / bounds.width()).min(visible.height() / bounds.height()).min(xf.zoom).max(0.02); + Some(CameraRequest { + center: [center[0] as f32, center[1] as f32], + zoom: (zoom != xf.zoom).then_some(zoom * ppp), + }) +} + fn fit_candidate(image: [f32; 4], source: Vec2) -> [f32; 4] { if source.x <= 0.0 || source.y <= 0.0 || !source.x.is_finite() || !source.y.is_finite() { return image; @@ -654,6 +668,9 @@ fn location(doc: &Document, rows: &[Row<'_>], target: &Value, width: f32, images // picture when a candidate has a different aspect ratio. return Some(images.get(task).map_or(bounds, |texture| fit_candidate(bounds, texture.size_vec2()))); } + if target["locateImageSlot"] == true && let Some(bounds) = row.and_then(frame) { + return Some(bounds); + } // Native text, pixels and groups already have document-space bounds. Use // those current bounds after manual moves; candidate cards stay separate. if let Some(layer) = target["nativeLayerId"].as_u64().and_then(|id| doc.layer(photocraft_doc::LayerId(id))) { @@ -2018,14 +2035,6 @@ impl Workspace { } } let selected = includes_target(self.canvas_workspace.context.as_ref(), slot_id, None); - let hovered = world_pointer.is_some_and(|p| rect.contains(xf.to_screen(p[0] as f32,p[1] as f32))); - if (selected || hovered) && rect.intersects(xf.rect) { - let name = short_slot_label(row.slot); - let galley = painter.layout_no_wrap(name.to_owned(), FontId::proportional(12.0), Color32::WHITE); - let chip = Rect::from_min_size(rect.left_top() + vec2(2.0,2.0), galley.size()+vec2(10.0,5.0)); - painter.rect_filled(chip, 5.0, Color32::from_black_alpha(185)); - painter.galley(chip.min+vec2(5.0,2.5),galley,Color32::WHITE); - } if selected && rect.intersects(xf.rect) { super::agent_motion::role_light(ui, super::agent_motion::Surface::new(ui.scope_id().with(("selected-slot", doc_id, slot_id)), rect, 0.0).clipped_to(xf.rect), self.reduce_motion, super::agent_motion::LightRole::CanvasTarget); } @@ -2108,7 +2117,9 @@ impl Workspace { self.canvas_workspace.geometry.insert(key.clone(), [visible.min.x, visible.min.y, visible.width(), visible.height()]); let response = ui.interact(visible, ui.scope_id().with(("canvas-candidate", &self.canvas_workspace.binding, doc_id, &variant, slot_id, id)), Sense::click()); response.widget_info(|| { - egui::WidgetInfo::labeled(egui::Role::Button, true, format!("{},候选 {}", row.slot["label"].as_str().unwrap_or("图片"), index + 1)) + let field = row.slot["label"].as_str().unwrap_or("图片"); + let label = if candidate.is_some() { format!("{field},候选 {}", index + 1) } else { format!("{field},生成图片") }; + egui::WidgetInfo::labeled(egui::Role::Button, true, label) }); if result.pointer_on_image { result.blocked = true; @@ -2116,7 +2127,7 @@ impl Workspace { let selected = includes_target(self.canvas_workspace.context.as_ref(), slot_id, Some(id)); let footer_height = if rect.width() >= 180.0 && rect.height() >= 110.0 { 42.0 } else { 0.0 }; let screen_scale = (rect.width() / image_world[2]).max(0.001); - if !self.agent_images.contains_key(task_id) { + if candidate.is_some() && !self.agent_images.contains_key(task_id) { painter.rect_filled(image_rect, 5.0, t.field); } let mut has_image = false; @@ -2247,13 +2258,15 @@ impl Workspace { if menu.1.is_some() { result.professional_request = menu.1; } result.menu_shown |= menu.2; } else { - painter.text(image_rect.center(), Align2::CENTER_CENTER, "生成图片", FontId::proportional(14.0), t.text_dim); + kit::paint_generation_placeholder(ui, &response, image_rect, self.reduce_motion); + let response = response.on_hover_text(format!("为{}生成图片", short_slot_label(row.slot))); if response.clicked() { let mut target = scope(row.slot, None, variant, variant_label); target["nativeLayerId"] = json!(mapping_layer); self.canvas_workspace.context = Some(target.clone()); self.canvas_workspace.open_regen(target, workflow); } + return result; } if selected { super::agent_motion::role_light(ui, super::agent_motion::Surface::new(response.id.with("selection-light"), rect, 5.0).clipped_to(xf.rect), self.reduce_motion, super::agent_motion::LightRole::CanvasTarget); @@ -2680,7 +2693,9 @@ impl Workspace { let mut blocked = self.canvas_workspace.regen.is_some(); let mut camera = None; self.canvas_workspace.clear_canvas_geometry(); - if let Some(state) = app.session.active() { self.paint_processing_status(&state.doc, &painter, xf, &t); } + if let Some(state) = app.session.active() { + self.paint_processing_status(&state.doc, ui, &rows, xf, &t); + } let mut action: Option<(&str, Value)> = None; let mut professional_request: Option> = None; let now = ui.input(|i| i.time); @@ -2689,6 +2704,13 @@ impl Workspace { let layer_map = app.session.active().map(|s| native_layers(&s.doc)).unwrap_or_default(); let selection: Vec<_> = selected_layers.iter().map(|id| id.0).collect(); let selection_changed = self.canvas_workspace.selection != selection; + let canvas_navigation = pointer.is_some() && ui.input(|input| { + input.pointer.middle_down() + || input.raw.events.iter().any(|event| matches!(event, egui::Event::MouseWheel { .. })) + }); + if selection_changed || canvas_navigation || self.canvas_workspace.locate_request.is_some() { + self.canvas_workspace.candidate_tab_page = None; + } if selection_changed || self.canvas_workspace.context.is_none() { self.canvas_workspace.context = app.session.active().and_then(|state| native_selection_subject(&state.doc, &workflow, &variant, &variant_label, &selection)); @@ -2728,43 +2750,46 @@ impl Workspace { && { let page = world_rect(xf, frame(row).unwrap_or([0.0, row.page_top, width, row.page_height])); page.bottom() > xf.rect.top() && page.top() < xf.rect.bottom() + || self.canvas_workspace.candidate_tab_page.as_ref() + == Some(&row.slot["documentId"]) }).or(nearest); if let Some(row) = current { let slot_id = row.slot["id"].as_str().unwrap_or(""); let mapping_layer = row.slot["nativeLayerId"].as_u64().or_else(|| layer_map.get(slot_id).copied()); - let all = candidates(row.slot); - let count = all.len().max(1); + let count = candidates(row.slot).len() + 1; let group = world_rect(xf, candidate_group(row, width, count)); - if group.intersects(xf.rect) { + let keep_tabs = self.canvas_workspace.candidate_tab_page.as_ref() == Some(&row.slot["documentId"]); + if group.intersects(xf.rect) || keep_tabs { self.canvas_workspace.geometry.insert( format!("candidate-group:{slot_id}"), [group.min.x, group.min.y, group.width(), group.height()], ); - let tabs = rows.iter().filter(|item| item.slot["documentId"] == row.slot["documentId"]); - let left = group.left().max(xf.rect.left()); - let top = (group.top() - 46.0).max(xf.rect.top() + 4.0); - let tabs_rect = Rect::from_min_max(pos2(left,top),pos2(xf.rect.right(),top+38.0)); - if tabs_rect.width() > 40.0 { - let mut tabs_ui = ui.new_child(egui::UiBuilder::new() - .id_salt(("candidate-slot-tabs",doc_id,row.slot["documentId"].as_str())) - .max_rect(tabs_rect).layout(egui::Layout::left_to_right(egui::Align::Center))); - tabs_ui.set_clip_rect(tabs_rect.intersect(xf.rect)); - egui::ScrollArea::horizontal().id_salt("slots").show(&mut tabs_ui, |ui| { - ui.horizontal(|ui| for item in tabs { - let item_id = item.slot["id"].as_str().unwrap_or(""); - let button = super::stitch_ui::filter_chip(ui,short_slot_label(item.slot),item_id==slot_id,!blocked_by_overlay,self.reduce_motion) - .on_hover_text(candidate_group_label(item.slot, |c| candidate_is_running(self,doc_id,item_id,c))); - self.canvas_workspace.geometry.insert(format!("candidate-tab:{item_id}"), - [button.rect.min.x,button.rect.min.y,button.rect.width(),button.rect.height()]); - if button.clicked() { - let mut target = scope(item.slot,None,&variant,&variant_label); - target["nativeLayerId"] = item.slot.get("nativeLayerId").cloned() - .filter(|value| !value.is_null()).unwrap_or_else(||json!(layer_map.get(item_id))); - self.canvas_workspace.context = Some(target.clone()); - self.canvas_workspace.locate_request = Some(target); - } - }); - }); + let tabs: Vec<_> = rows.iter().filter(|item| item.slot["documentId"] == row.slot["documentId"]).collect(); + let left = group.left().clamp(xf.rect.left(), (xf.rect.right() - 160.0).max(xf.rect.left())); + let top = (group.top() - 46.0).clamp(xf.rect.top() + 4.0, (xf.rect.bottom() - 42.0).max(xf.rect.top() + 4.0)); + let start = pos2(left, top); + let tabs_rect = Rect::from_min_max(start, pos2(xf.rect.right(), start.y + 40.0)); + if tabs_rect.width() > 56.0 { + let tabs_id = ui.scope_id().with(("candidate-slot-tabs", doc_id, row.slot["documentId"].as_str())); + let mut tabs_ui = ui.new_child(egui::UiBuilder::new().id_salt(tabs_id) + .max_rect(tabs_rect).layout(egui::Layout::top_down(egui::Align::Min))); + tabs_ui.set_clip_rect(tabs_rect); + if let Some(item) = self.draw_candidate_tabs(&mut tabs_ui, &tabs, slot_id, tabs_id, doc_id, blocked_by_overlay) { + let item_id = item.slot["id"].as_str().unwrap_or(""); + let mut target = scope(item.slot, None, &variant, &variant_label); + target["nativeLayerId"] = item.slot.get("nativeLayerId").cloned() + .filter(|value| !value.is_null()).unwrap_or_else(|| json!(layer_map.get(item_id))); + target["locateImageSlot"] = json!(true); + self.canvas_workspace.context = Some(target.clone()); + self.canvas_workspace.candidate_tab_page = Some(item.slot["documentId"].clone()); + self.canvas_workspace.initial_focus = false; + self.canvas_workspace.locate_motion = None; + self.canvas_workspace.locate_highlight = Some((target, now)); + self.canvas_workspace.locate_scope = Some(self.locate_scope_for(app, doc_id, &output, &variant)); + if let Some(bounds) = frame(item) { + camera = fit_tag_selection(xf, bounds, card(item, width, 0), ui.ctx().pixels_per_point()); + } + } blocked |= pointer.is_some_and(|p| tabs_rect.contains(p)); } } @@ -2829,6 +2854,7 @@ impl Workspace { blocked = true; } self.canvas_workspace.remember_native_selection(app); + self.canvas_workspace.candidate_tab_page = None; self.canvas_workspace.locate_request = None; self.canvas_workspace.locate_highlight = None; self.canvas_workspace.locate_motion = None; @@ -3109,19 +3135,91 @@ fn processing_status(doc: &Document, field: &Value, variant: &str, messages: &[V } impl Workspace { - fn paint_processing_status(&mut self, doc: &Document, painter: &egui::Painter, xf: ViewXform, t: &Tokens) { + fn draw_candidate_tabs<'a>(&mut self, ui: &mut Ui, tabs: &[&'a Row<'a>], slot_id: &str, id: egui::Id, doc_id: u64, blocked: bool) -> Option<&'a Row<'a>> { + let labels: Vec<_> = tabs.iter().map(|item| short_slot_label(item.slot)).collect(); + let widths: Vec<_> = labels.iter().map(|label| kit::segment_width(ui, label)).collect(); + let current = tabs.iter().position(|item| item.slot["id"] == slot_id)?; + let limit = ui.available_width() - kit::SEGMENT_RAIL_PADDING; + let all_fit = widths.iter().sum::() + kit::SEGMENT_GAP * widths.len().saturating_sub(1) as f32 <= limit; + let mut remaining = limit - widths[current] - kit::SEGMENT_MORE_WIDTH - kit::SEGMENT_GAP; + let mut visible = Vec::new(); + let mut hidden = Vec::new(); + for (index, width) in widths.into_iter().enumerate() { + if all_fit || index == current { + visible.push(index); + } else if width + kit::SEGMENT_GAP <= remaining { + remaining -= width + kit::SEGMENT_GAP; + visible.push(index); + } else { + hidden.push(index); + } + } + + let popup_id = id.with("more"); + let popup_open = egui::Popup::is_id_open(ui.ctx(), popup_id); + let enabled = !blocked || popup_open; + let options: Vec<_> = visible.iter().map(|index| (labels[*index], enabled)).collect(); + let active = visible.iter().position(|index| *index == current)?; + let strip = kit::candidate_segments(ui, id, &options, active, self.reduce_motion, (!hidden.is_empty()).then_some(enabled)); + let refocus = id.with("refocus"); + if ui.data_mut(|data| data.remove_temp::(refocus)) == Some(true) { + strip.responses[active].request_focus(); + } + for (index, button) in visible.iter().zip(&strip.responses) { + let item = tabs[*index]; + let item_id = item.slot["id"].as_str().unwrap_or(""); + button.clone().on_hover_text(candidate_group_label(item.slot, |candidate| candidate_is_running(self, doc_id, item_id, candidate))); + let rect = button.rect; + let bounds = [rect.min.x, rect.min.y, rect.width(), rect.height()]; + self.canvas_workspace.geometry.insert(format!("candidate-tab:{item_id}"), bounds); + if button.has_focus() { + self.canvas_workspace.geometry.insert("candidate-tab-focus".into(), bounds); + } + } + let mut chosen = strip.selected.map(|index| visible[index]); + if let Some(more) = strip.more { + let rect = more.rect; + self.canvas_workspace.geometry.insert("candidate-tab-more".into(), [rect.min.x, rect.min.y, rect.width(), rect.height()]); + let popup = egui::Popup::menu(&more).id(popup_id).frame(kit::surface_frame(ui.ctx(), kit::SurfaceRole::Menu)); + popup.show(|ui| { + constrain_candidate_menu_width(ui); + for index in hidden { + let button = ui.button(labels[index]); + let item_id = tabs[index].slot["id"].as_str().unwrap_or(""); + let rect = button.rect; + self.canvas_workspace.geometry.insert(format!("candidate-tab-menu:{item_id}"), [rect.min.x, rect.min.y, rect.width(), rect.height()]); + if button.clicked() { + chosen = Some(index); + ui.close(); + } + } + }); + } else if popup_open { + egui::Popup::close_id(ui.ctx(), popup_id); + } + chosen.map(|index| { + ui.data_mut(|data| data.insert_temp(refocus, true)); + tabs[index] + }) + } + + fn paint_processing_status(&mut self, doc: &Document, ui: &Ui, rows: &[Row<'_>], xf: ViewXform, t: &Tokens) { let Some(mapping)=document_mapping(doc) else { return }; + let painter = ui.painter_at(xf.rect); let variant=mapping["variantId"].as_str().unwrap_or(""); let fields=mapping["fields"].as_array().into_iter().flatten().chain(mapping["outputs"].as_array().into_iter().flatten() .flat_map(|page|page["mapping"]["fields"].as_array().into_iter().flatten())); + let slots: HashMap<_, _> = rows.iter().filter_map(|row| row.slot["id"].as_str().map(|id| (id, row))).collect(); let mut original=0;let mut processed=0;let mut changed=0; for field in fields { let status=processing_status(doc,field,variant,&self.messages); match status {"小壹已处理"=>processed+=1,"已修改"=>changed+=1,_=>original+=1}; - let frame=&field["frame"]; - let Some(values)=frame["x"].as_f64().zip(frame["y"].as_f64()).zip(frame["width"].as_f64().zip(frame["height"].as_f64())) else {continue}; + let frame_value=&field["frame"]; + let Some(values)=frame_value["x"].as_f64().zip(frame_value["y"].as_f64()) + .zip(frame_value["width"].as_f64().zip(frame_value["height"].as_f64())) else { continue }; let ((x,y),(w,h))=values; - let rect=world_rect(xf,[x as f32,y as f32,w as f32,h as f32]); + let slot = field["slotId"].as_str().and_then(|id| slots.get(id)).copied(); + let rect = world_rect(xf, slot.and_then(frame).unwrap_or([x as f32,y as f32,w as f32,h as f32])); if !rect.intersects(xf.rect) {continue;} let id=field["fieldId"].as_str().unwrap_or(""); self.canvas_workspace.geometry.insert(format!("field-state:{status}:{id}"),[rect.min.x,rect.min.y,rect.width(),rect.height()]); @@ -3132,7 +3230,17 @@ impl Workspace { painter.circle_filled(pos2(rect.right()-3.0,rect.top()+3.0),if modified{3.0}else{2.0},color); } let hovered=painter.ctx().pointer_hover_pos().is_some_and(|p|rect.contains(p)); - if (rect.width()>110.0 && rect.height()>48.0)||hovered { + if let Some(row) = slot { + let visible = rect.intersect(xf.rect).shrink(6.0); + if visible.width() < 88.0 || visible.height() < 24.0 || (rect.height() < 42.0 && !hovered) { continue; } + let status_text = if modified { status } else { "原稿未处理" }; + let label = format!("{} · {status_text}", short_slot_label(row.slot)); + let label_width = painter.layout_no_wrap(label.clone(), FontId::proportional(11.76), t.text).size().x; + let badge = Rect::from_min_size(visible.min, vec2((label_width + 18.0).min(visible.width()), 24.0)); + let slot_id = row.slot["id"].as_str().unwrap_or(""); + kit::paint_badge(ui, ui.scope_id().with(("canvas-field-state", slot_id)), badge, BadgeKind::Neutral, &label, self.reduce_motion); + self.canvas_workspace.geometry.insert(format!("canvas-status-badge:{slot_id}"), [badge.min.x, badge.min.y, badge.width(), badge.height()]); + } else if (rect.width()>110.0 && rect.height()>48.0)||hovered { let galley=painter.layout_no_wrap(status.into(),FontId::proportional(11.0),color); let size=galley.size()+vec2(12.0,6.0); let pos=pos2(rect.left().clamp(xf.rect.left(),(xf.rect.right()-size.x).max(xf.rect.left())),(rect.top()-size.y-3.0).max(xf.rect.top())); @@ -3162,7 +3270,7 @@ pub(crate) fn navigation_size(app: &PhotocraftApp, doc: u64, size: [u32; 2]) -> return size; } let width = rows.iter().map(|row| { - let group = candidate_group(row, size[0] as f32, candidates(row.slot).len().max(1)); + let group = candidate_group(row, size[0] as f32, candidates(row.slot).len() + 1); f64::from(group[0]) + f64::from(group[2]) }).fold(f64::from(size[0]), f64::max); [width.min(f64::from(u32::MAX)).ceil() as u32, size[1]] @@ -5220,6 +5328,21 @@ mod tests { assert!(requests.try_recv().is_err()); } + #[test] + fn candidate_tag_fit_keeps_both_the_bitmap_slot_and_candidate_in_view() { + let view = ViewXform { + rect: Rect::from_min_size(pos2(40.0, 50.0), vec2(780.0, 520.0)), + zoom: 0.65, center: [1500.0, 2800.0], flip: false, rotation: 0.0, aspect: 1.0, + }; + let slot = [100.0, 3600.0, 680.0, 1390.0]; + let candidate = [1500.0, 3650.0, 420.0, 850.0]; + let camera = fit_tag_selection(view, slot, candidate, 1.5).unwrap(); + let fitted = ViewXform { center: camera.center, zoom: camera.zoom.unwrap() / 1.5, ..view }; + assert!(fitted.rect.contains_rect(world_rect(fitted, slot))); + assert!(fitted.rect.contains_rect(world_rect(fitted, candidate))); + assert!(fit_tag_selection(fitted, slot, candidate, 1.5).is_none()); + } + #[test] fn partially_visible_targets_recenter_once_without_changing_zoom() { for frame in [json!({"x":1100,"y":40,"width":400,"height":50}), json!({"x":-200,"y":40,"width":250,"height":50})] { diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/stitch_ui.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/stitch_ui.rs index c8a1615a..c3cc3cd8 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/stitch_ui.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/stitch_ui.rs @@ -1596,25 +1596,48 @@ fn choice_option(ui: &mut Ui, label: &str, selected: bool, enabled: bool, widget pub(super) struct HaloSegmented { pub responses: Vec, pub selected: Option, + pub more: Option, } /// One group identity owns the sliding selection; each native radio target /// retains its own response, including when the options wrap as whole items. pub(super) fn segmented_control(ui: &mut Ui, id: egui::Id, options: &[(&str, bool)], selected: usize, reduced: bool) -> HaloSegmented { + segmented_control_inner(ui, id, options, selected, reduced, false, None) +} + +pub(super) fn candidate_segments(ui: &mut Ui, id: egui::Id, options: &[(&str, bool)], selected: usize, reduced: bool, more: Option) -> HaloSegmented { + segmented_control_inner(ui, id, options, selected, reduced, true, more) +} + +pub(super) const SEGMENT_RAIL_PADDING: f32 = 8.0; +pub(super) const SEGMENT_GAP: f32 = 2.0; +pub(super) const SEGMENT_MORE_WIDTH: f32 = 34.0; + +pub(super) fn segment_width(ui: &Ui, label: &str) -> f32 { + ui.painter().layout_no_wrap(label.to_owned(), FontId::proportional(13.0), Color32::WHITE).size().x + 24.0 +} + +fn segmented_control_inner(ui: &mut Ui, id: egui::Id, options: &[(&str, bool)], selected: usize, reduced: bool, glass: bool, overflow: Option) -> HaloSegmented { let t = Tokens::get(ui.ctx()).agent(); - let frame = Frame::NONE.fill(t.field).corner_radius(12).inner_margin(3); + let rail = super::agent_motion::reserve_background(ui); + let frame = if glass { + Frame::NONE.corner_radius(20).inner_margin(3).stroke(Stroke::new(1.0, Color32::TRANSPARENT)) + } else { + Frame::NONE.fill(t.field).corner_radius(12).inner_margin(3) + }; let mut prepared = frame.begin(ui); let background = super::agent_motion::reserve_background(&prepared.content_ui); let available = prepared.content_ui.available_width().max(1.0); let mut responses = Vec::with_capacity(options.len()); let mut chosen = None; + let mut more = None; prepared.content_ui.push_id(id, |ui| { - ui.spacing_mut().item_spacing = vec2(2.0, 2.0); - ui.horizontal_wrapped(|ui| { + ui.spacing_mut().item_spacing = vec2(SEGMENT_GAP, SEGMENT_GAP); + let option_width = available - overflow.map_or(0.0, |_| SEGMENT_MORE_WIDTH + SEGMENT_GAP); + let mut contents = |ui: &mut Ui| { for (index, (label, enabled)) in options.iter().copied().enumerate() { let enabled = enabled && ui.is_enabled(); - let label_width = ui.painter().layout_no_wrap(label.to_owned(), FontId::proportional(13.0), t.text).size().x; - let width = (label_width + 24.0).min(available).max(1.0); + let width = segment_width(ui, label).min(option_width).max(1.0); let button = egui::Button::new(RichText::new(label).size(13.0).color(if enabled { t.text } else { t.text_faint })) .frame(false).min_size(vec2(width, 32.0)).truncate(); let response = ui.add_enabled(enabled, button); @@ -1622,7 +1645,15 @@ pub(super) fn segmented_control(ui: &mut Ui, id: egui::Id, options: &[(&str, boo if response.clicked() { chosen = Some(index); } responses.push(response); } - }); + if let Some(enabled) = overflow { + let button = egui::Button::image(crate::icons::image("ellipsis", 16.0, t.text)) + .frame(false).min_size(vec2(SEGMENT_MORE_WIDTH, 32.0)); + let response = ui.add_enabled(enabled, button).on_hover_text("更多图位"); + response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, enabled, "更多图位")); + more = Some(response); + } + }; + if glass { ui.horizontal(&mut contents); } else { ui.horizontal_wrapped(&mut contents); } }); let direction = if ui.is_enabled() && responses.iter().any(Response::has_focus) { ui.input_mut(|input| { @@ -1644,14 +1675,63 @@ pub(super) fn segmented_control(ui: &mut Ui, id: egui::Id, options: &[(&str, boo } let rect = frame.widget_rect(prepared.content_ui.min_rect()); prepared.end(ui); + if glass { + material(ui, id.with("rail"), rect, 20.0, 0.0, rail); + } if let Some(target) = responses.get(chosen.unwrap_or(selected)).map(|response| response.rect) { let target = target.translate(-rect.min.to_vec2()); let sample = |axis: &str, value: f32| ui.ctx().animate_value_with_time(id.with(axis), value, if reduced { 0.0 } else { 0.22 }); let min = egui::pos2(sample("x", target.min.x), sample("y", target.min.y)) + rect.min.to_vec2(); let size = vec2(sample("width", target.width()), sample("height", target.height())); - ui.painter().set(background,egui::Shape::rect_filled(egui::Rect::from_min_size(min,size),9.0,Tokens::get(ui.ctx()).agent().pressed)); + let selection = egui::Rect::from_min_size(min, size); + if glass { + ui.painter().set(background, egui::Shape::rect_filled(selection, 16.0, material_fallback(0.85))); + if !reduced && (selection.min - rect.min.to_vec2()).distance(target.min) > 0.5 { + super::glow_pill::background(ui, id.with("selection"), selection, 16.0, 0.22, background); + } + ui.painter().rect_stroke(selection, 16.0, Stroke::new(1.0, t.text_dim.gamma_multiply(0.5)), egui::StrokeKind::Inside); + } else { + ui.painter().set(background, egui::Shape::rect_filled(selection, 9.0, t.pressed)); + } } - HaloSegmented { responses, selected: chosen } + if glass { + for response in responses.iter().chain(more.iter()).filter(|response| response.has_focus()) { + ui.painter().rect_stroke(response.rect.shrink(1.0), 15.0, Stroke::new(1.0, t.text_dim), egui::StrokeKind::Inside); + } + } + HaloSegmented { responses, selected: chosen, more } +} + +pub(super) fn paint_generation_placeholder(ui: &mut Ui, response: &Response, rect: egui::Rect, reduced: bool) { + ui.scope(|ui| { + ui.set_clip_rect(response.rect.intersect(ui.clip_rect())); + let t = Tokens::get(ui.ctx()).agent(); + let gain = super::agent_motion::hover_amount(ui, response.id.with("hover"), rect, response.hovered() || response.has_focus(), reduced); + let background = super::agent_motion::reserve_background(ui); + let radius = (rect.height() * 0.08).clamp(4.0, 12.0); + material(ui, response.id, rect, radius, 0.24 * gain, background); + if response.has_focus() { + ui.painter().rect_stroke(rect, radius, Stroke::new(1.0, t.text_dim), egui::StrokeKind::Inside); + } + let text = ui.painter().layout_no_wrap("生成图片".into(), FontId::proportional(14.0), t.text); + let icon_size = 16.0; + let gap = 7.0; + let visible = ui.clip_rect().intersect(rect); + let content_width = text.size().x + icon_size + gap; + if visible.width() >= content_width + 10.0 && visible.height() >= 24.0 { + let inset = content_width * 0.5 + 5.0; + let center_x = rect.center().x.clamp(visible.left() + inset, visible.right() - inset); + let center_y = rect.center().y.clamp(visible.top() + 12.0, visible.bottom() - 12.0); + let left = center_x - content_width * 0.5; + let icon = egui::Rect::from_center_size(egui::pos2(left + icon_size * 0.5, center_y), vec2(icon_size, icon_size)); + crate::icons::paint(ui, icon, "plus", icon_size, t.text); + let label = egui::pos2(left + icon_size + gap, center_y - text.size().y * 0.5); + ui.painter().galley(label, text, t.text); + } else if visible.width() >= 22.0 && visible.height() >= 22.0 { + let icon = egui::Rect::from_center_size(visible.center(), vec2(icon_size, icon_size)); + crate::icons::paint(ui, icon, "plus", icon_size, t.text); + } + }); } /// Preserve caller-owned hit target sizes where an existing workflow depends @@ -2145,24 +2225,54 @@ mod tests { crate::PhotocraftApp::setup_context(&ctx, crate::theme::ThemeKind::ProMedium); crate::cjk_fonts::install_system_provider_for_tests(&ctx); let mut first_id = None; - let _ = ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(300.0, 300.0))), ..Default::default() }, |ui| { + ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(300.0, 300.0))), ..Default::default() }, |ui| { ui.set_width(100.0); let group = segmented_control(ui, egui::Id::unique("test-segments"), &[("详情", true), ("主图", false), ("SKU", true)], 0, true); assert_eq!(group.responses.len(), 3); assert!(group.responses[1].rect.top() >= group.responses[0].rect.bottom(), "narrow groups wrap complete controls"); first_id = Some(group.responses[0].id); - }); + }).textures_delta.clear(); ctx.memory_mut(|memory| memory.request_focus(first_id.unwrap())); let mut choice = None; - let _ = ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(300.0, 300.0))), events: vec![egui::Event::Key { + ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(300.0, 300.0))), events: vec![egui::Event::Key { key: egui::Key::ArrowRight, physical_key: Some(egui::Key::ArrowRight), pressed: true, repeat: false, modifiers: egui::Modifiers::NONE, }], ..Default::default() }, |ui| { ui.set_width(100.0); choice = segmented_control(ui, egui::Id::unique("test-segments"), &[("详情", true), ("主图", false), ("SKU", true)], 0, true).selected; - }); + }).textures_delta.clear(); assert_eq!(choice, Some(2)); } + #[test] + fn halo_segmented_glass_slides_within_a_single_rail_and_respects_reduced_motion() { + let ctx = Context::default(); + let sample = |time: f64, selected, reduced| { + let mut targets = Vec::new(); + let mut output = ctx.run_ui(egui::RawInput { time: Some(time), ..Default::default() }, |ui| { + ui.set_width(270.0); + let rail = candidate_segments(ui, egui::Id::unique("glass-test"), &[("Wood", true), ("Finish", true)], selected, reduced, Some(true)); + let more = rail.more.expect("overflow button"); + assert!(rail.responses.iter().all(|item| item.rect.center().y == more.rect.center().y && item.rect.right() <= more.rect.left())); + targets = rail.responses.into_iter().map(|item| item.rect.left()).collect(); + }); + let painted_x = output.shapes.iter().find_map(|shape| match &shape.shape { + egui::Shape::Rect(rect) if rect.corner_radius.nw == 16 && rect.fill != Color32::TRANSPARENT => Some(rect.rect.left()), + _ => None, + }).expect("glass selection is painted"); + output.textures_delta.clear(); + (painted_x, targets) + }; + let (start, targets) = sample(0.0, 0, false); + assert_eq!(start, targets[0]); + sample(0.1, 1, false); + let (middle, _) = sample(0.18, 1, false); + assert!(start < middle && middle < targets[1]); + let (end, _) = sample(0.5, 1, false); + assert_eq!(end, targets[1]); + let (reduced, _) = sample(0.6, 0, true); + assert_eq!(reduced, start); + } + #[test] fn filter_chip_keeps_native_keyboard_focus_and_disabled_semantics() { let ctx = Context::default();