diff --git a/assets/icons/ui/design/requested_icons.txt b/assets/icons/ui/design/requested_icons.txt index aa4514a87..08639d4f8 100644 --- a/assets/icons/ui/design/requested_icons.txt +++ b/assets/icons/ui/design/requested_icons.txt @@ -259,6 +259,7 @@ split_face false spun false star false status_error false +status_pin false status_recovery false style false style_hidden_edges false diff --git a/assets/icons/ui/design/svg/flat/status_pin.svg b/assets/icons/ui/design/svg/flat/status_pin.svg new file mode 100644 index 000000000..ef1d0759f --- /dev/null +++ b/assets/icons/ui/design/svg/flat/status_pin.svg @@ -0,0 +1,5 @@ + + Pinned result + + + diff --git a/assets/locales/pending/viewport-status-item.json b/assets/locales/pending/viewport-status-item.json new file mode 100644 index 000000000..cc4687e06 --- /dev/null +++ b/assets/locales/pending/viewport-status-item.json @@ -0,0 +1,66 @@ +{ + "en": { + "ui.viewport_status_clear": "Turn off {name}", + "ui.viewport_status_clear_hint": "Turn off {name} · Esc", + "ui.viewport_status_key": "Show key for {name}", + "ui.viewport_status_minimum_radius": "Minimum radius", + "ui.viewport_status_stripes": "{count} stripes", + "ui.viewport_status_pairs": "{count} pairs" + }, + "ar": { + "ui.viewport_status_clear": "إيقاف {name}", + "ui.viewport_status_clear_hint": "إيقاف {name} · Esc", + "ui.viewport_status_key": "إظهار مفتاح الألوان لـ {name}", + "ui.viewport_status_minimum_radius": "أقل نصف قطر", + "ui.viewport_status_stripes": "{count} شريطًا", + "ui.viewport_status_pairs": "{count} أزواج" + }, + "de": { + "ui.viewport_status_clear": "{name} ausschalten", + "ui.viewport_status_clear_hint": "{name} ausschalten · Esc", + "ui.viewport_status_key": "Legende für {name} anzeigen", + "ui.viewport_status_minimum_radius": "Mindestradius", + "ui.viewport_status_stripes": "{count} Streifen", + "ui.viewport_status_pairs": "{count} Paare" + }, + "he": { + "ui.viewport_status_clear": "כיבוי {name}", + "ui.viewport_status_clear_hint": "כיבוי {name} · Esc", + "ui.viewport_status_key": "הצגת מקרא עבור {name}", + "ui.viewport_status_minimum_radius": "רדיוס מינימלי", + "ui.viewport_status_stripes": "{count} פסים", + "ui.viewport_status_pairs": "{count} זוגות" + }, + "ja": { + "ui.viewport_status_clear": "{name}をオフにする", + "ui.viewport_status_clear_hint": "{name}をオフにする · Esc", + "ui.viewport_status_key": "{name}の凡例を表示", + "ui.viewport_status_minimum_radius": "最小半径", + "ui.viewport_status_stripes": "縞 {count} 本", + "ui.viewport_status_pairs": "{count} 組" + }, + "ko": { + "ui.viewport_status_clear": "{name} 끄기", + "ui.viewport_status_clear_hint": "{name} 끄기 · Esc", + "ui.viewport_status_key": "{name} 범례 표시", + "ui.viewport_status_minimum_radius": "최소 반지름", + "ui.viewport_status_stripes": "줄무늬 {count}개", + "ui.viewport_status_pairs": "{count}쌍" + }, + "vi": { + "ui.viewport_status_clear": "Tắt {name}", + "ui.viewport_status_clear_hint": "Tắt {name} · Esc", + "ui.viewport_status_key": "Hiển thị chú giải cho {name}", + "ui.viewport_status_minimum_radius": "Bán kính nhỏ nhất", + "ui.viewport_status_stripes": "{count} sọc", + "ui.viewport_status_pairs": "{count} cặp" + }, + "zh": { + "ui.viewport_status_clear": "关闭{name}", + "ui.viewport_status_clear_hint": "关闭{name} · Esc", + "ui.viewport_status_key": "显示{name}的图例", + "ui.viewport_status_minimum_radius": "最小半径", + "ui.viewport_status_stripes": "{count} 条条纹", + "ui.viewport_status_pairs": "{count} 对" + } +} diff --git a/attribution/pending/viewport-status-item.md b/attribution/pending/viewport-status-item.md new file mode 100644 index 000000000..f86f49935 --- /dev/null +++ b/attribution/pending/viewport-status-item.md @@ -0,0 +1 @@ +| assets/icons/ui/design/svg/flat/status_pin.svg | SolidCraft contributors | Original analytic pin icon for persistent viewport results | MIT OR Apache-2.0 | diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs index db9713adf..37d2ecfbd 100644 --- a/crates/ui-egui/src/control.rs +++ b/crates/ui-egui/src/control.rs @@ -465,6 +465,7 @@ fn dispatch(app: &mut SolveApp, ctx: &egui::Context, method: &str, p: &Value) -> let f = |k: &str| p.get(k).and_then(Value::as_f64).filter(|x| x.is_finite()); let b = |k: &str| p.get(k).and_then(Value::as_bool).unwrap_or(false); match method { + "ui.status_fixture" => wrap(crate::viewport_status_fixture::control(app, p)), "ui.workspace" => { if let Some(workspace) = s("workspace") { if !matches!(workspace, "design" | "render") { @@ -1226,6 +1227,29 @@ mod tests { use super::*; use crate::Services; + #[test] + fn viewport_status_fixture_rejects_hostile_presets_without_mutating_the_session() { + let mut h = crate::scenario::Harness::new(); + let revision = h.app.session.revision; + for params in [Value::Null, json!([]), json!({}), json!({"preset":false}), json!({"preset":[]}), json!({"preset":"unknown"})] { + let reply = h.call("ui.status_fixture", params); + assert_eq!(reply["ok"], false, "{reply}"); + assert_eq!(h.app.session.revision, revision); + } + let reply = h.call("ui.status_fixture", json!({"preset":"mode"})); + assert_eq!(reply["ok"], true, "{reply}"); + assert_eq!(h.app.session.revision, revision); + assert!(h.app.session.analysis.is_none()); + for preset in ["off", "mode"] { + h.call("ui.status_fixture", json!({"preset":preset})); + h.call("ui.resize", json!({"width":200,"height":600})); + h.frames(4); + assert_eq!(h.app.session.revision, revision); + h.call("ui.resize", json!({"width":1400,"height":900})); + h.frames(4); + } + } + #[test] fn touchpad_automation_moves_with_modifiers_and_releases_without_buttons() { let mut h = crate::scenario::Harness::new(); diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 112c41ebf..57b66799e 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -294,6 +294,7 @@ mod view_confirm; pub mod view_pick; pub mod viewport; mod viewport_layout; +mod viewport_status_fixture; pub mod workspace; use std::sync::mpsc::Receiver; @@ -447,6 +448,7 @@ pub struct PreSketchComponent { } pub struct SolveApp { + pub(crate) viewport_status_fixture: viewport_status_fixture::Fixture, /// Compact browser embed: retain model panels and joint controls without application chrome. pub embedded: bool, pub session: Session, @@ -689,6 +691,7 @@ impl SolveApp { #[cfg(not(target_arch = "wasm32"))] solidcraft_engine::slicer_files::clean_old(); let mut app = SolveApp { + viewport_status_fixture: Default::default(), session, ui: UiState::default(), shell: Default::default(), diff --git a/crates/ui-egui/src/ui_kit/container.rs b/crates/ui-egui/src/ui_kit/container.rs index b9117d78b..291f59074 100644 --- a/crates/ui-egui/src/ui_kit/container.rs +++ b/crates/ui-egui/src/ui_kit/container.rs @@ -29,6 +29,8 @@ pub enum Surface { Toast, /// Viewport navigation controls (the compass itself is drawn geometry). Navigation, + /// Persistent, content-hugging status pills above the free model viewport. + ViewportStatus, /// Full-page content, the model viewport and native pop-out content. Viewport, /// Deliberate input-blocking backdrops; must not inherit CAD input blocking. @@ -145,6 +147,7 @@ impl Container { Surface::Palette => flat.stroke(t.primary_border(t.border)).corner_radius(t.radius_xl).shadow(t.shell_shadow()), Surface::Panel | Surface::Chrome => flat.stroke(t.primary_border(t.border)).corner_radius(t.radius_lg).shadow(t.shell_shadow()), Surface::Navigation => flat.stroke(t.primary_border(t.border)).corner_radius(t.radius_md), + Surface::ViewportStatus => flat.stroke(t.primary_border(t.border)).corner_radius((t.control_height / 2.0 + t.space_4) as u8), Surface::Toast => flat.stroke(t.primary_border(t.border)).corner_radius(t.radius_md).shadow(t.shell_shadow()), Surface::Popup => Self::popup_frame(&ctx.global_style()).fill(fill), Surface::ApplicationBar | Surface::Canvas | Surface::Viewport | Surface::InputShield => flat, diff --git a/crates/ui-egui/src/ui_kit/gallery.rs b/crates/ui-egui/src/ui_kit/gallery.rs index d2e7c1391..76e77bb31 100644 --- a/crates/ui-egui/src/ui_kit/gallery.rs +++ b/crates/ui-egui/src/ui_kit/gallery.rs @@ -55,6 +55,17 @@ fn navigation_sample(ui: &mut Ui, size: crate::navigation_bar::Size) { // One entry per element/variant: names, rendering and geometry expectations stay together. const ELEMENTS: &[Element] = &[ + element!("viewport_status_item", "viewport_status:sample:item", Some("viewport_status:sample:close"), |ui, _| { + let item = StatusItem { + id: "sample".into(), + kind: StatusKind::Mode, + name: "Draft".into(), + setting: "Z · 1°".into(), + has_key: true, + editable: false, + }; + viewport_status_item(ui, &item, &mut StatusPresentation::default()); + }), element!("sphere_thumbnail", |ui, _| { ui.horizontal(|ui| { for kind in [FinishKind::Matte, FinishKind::Satin, FinishKind::Gloss, FinishKind::Metal, FinishKind::Glass] { diff --git a/crates/ui-egui/src/ui_kit/mod.rs b/crates/ui-egui/src/ui_kit/mod.rs index 8b4c04773..4f2461305 100644 --- a/crates/ui-egui/src/ui_kit/mod.rs +++ b/crates/ui-egui/src/ui_kit/mod.rs @@ -42,6 +42,7 @@ mod table; mod text; mod tree; mod value_focus; +mod viewport_status; pub(crate) use actions::*; pub use actions::{Button, button}; @@ -90,6 +91,7 @@ pub(crate) use status::*; pub(crate) use table::*; pub(crate) use tree::*; pub(crate) use value_focus::*; +pub(crate) use viewport_status::*; #[cfg(test)] mod gallery; diff --git a/crates/ui-egui/src/ui_kit/panel_tests.rs b/crates/ui-egui/src/ui_kit/panel_tests.rs index 49f74eed5..1615425e0 100644 --- a/crates/ui-egui/src/ui_kit/panel_tests.rs +++ b/crates/ui-egui/src/ui_kit/panel_tests.rs @@ -853,6 +853,7 @@ fn universal_containers_follow_one_layout_without_changing_transient_surfaces() Surface::Canvas, Surface::Toast, Surface::Navigation, + Surface::ViewportStatus, Surface::Viewport, Surface::InputShield, ] { diff --git a/crates/ui-egui/src/ui_kit/viewport_status.rs b/crates/ui-egui/src/ui_kit/viewport_status.rs new file mode 100644 index 000000000..7f033329e --- /dev/null +++ b/crates/ui-egui/src/ui_kit/viewport_status.rs @@ -0,0 +1,189 @@ +//! Persistent viewport status content. The caller owns items and dispatches returned actions. +use super::{Button, Container, Surface}; +use crate::{fonts::RichTextExt as _, scenario, theme::Tokens}; +use egui::{Id, Rect, Response, RichText, Ui, vec2}; + +/// Shape and outline communicate the kind independently of colour. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(crate) enum StatusKind { + Mode, + Result, + Attention, +} + +impl StatusKind { + pub(crate) fn icon(self) -> &'static str { + match self { + Self::Mode => "eye", + Self::Result => "status_pin", + Self::Attention => "warning", + } + } +} + +/// Presentation data, already translated and formatted in the design's units. +/// A later engine adapter supplies this without storing session state in the widget. +pub(crate) struct StatusItem { + pub id: String, + pub kind: StatusKind, + pub name: String, + pub setting: String, + pub has_key: bool, + pub editable: bool, +} + +#[derive(Default)] +pub(crate) struct StatusPresentation { + pub open_key: Option, +} + +#[derive(Debug, PartialEq, Eq)] +pub(crate) enum StatusAction { + Clear(String), + Edit(String), +} + +fn target(item: &StatusItem, part: &str) -> String { + format!("viewport_status:{}:{part}", item.id) +} + +fn icon_action(ui: &mut Ui, item: &StatusItem, part: &str, icon: &str, label: &str, hint: &str, flipped: bool) -> Response { + let t = Tokens::get(); + let height = ui.spacing().interact_size.y.max(t.control_height); + let (rect, _) = ui.allocate_exact_size(vec2(t.space_24, height), egui::Sense::hover()); + let response = super::button_at(ui, &target(item, part), rect, "", Button::Ghost); + if response.clicked() { + response.request_focus(); + } + // Ghost keeps native button interaction but intentionally omits egui's frame. + // Status actions still need the local hover target required by this element. + if response.hovered() { + ui.painter().rect_filled(response.rect, t.control_radius, t.hover); + } + let glyph = Rect::from_center_size(response.rect.center(), vec2(t.space_24, t.space_24) - vec2(t.space_4, t.space_4) * 2.0); + if flipped { + crate::icons::paint_ink_flipped(ui.painter(), glyph, icon, t.text_dim); + } else { + crate::icons::paint_icon(ui.painter(), glyph, icon, 1.0); + } + response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), label)); + scenario::publish_target(&target(item, part), response.rect); + scenario::publish_target(&target(item, &format!("{part}_glyph")), glyph); + response.on_hover_text(hint) +} + +/// One pill, with native keyboard controls and no engine or camera input. +pub(crate) fn viewport_status_item(ui: &mut Ui, item: &StatusItem, state: &mut StatusPresentation) -> (Rect, Option) { + let t = Tokens::get(); + let (outline, disc) = match item.kind { + StatusKind::Mode => (t.accent, t.accent_soft), + StatusKind::Result => (t.border, t.text_dim.gamma_multiply(0.1)), + StatusKind::Attention => (t.warning, t.warning.gamma_multiply(0.12)), + }; + let container = Container::new(ui.ctx(), Surface::ViewportStatus); + let frame = container + .frame(ui.ctx(), t.overlay, crate::frame::Side::Left) + .stroke(t.primary_border(outline)) + .inner_margin(egui::Margin::symmetric(t.space_8 as i8, t.space_4 as i8)); + let mut action = None; + let response = container + .show_frame(ui, frame, ui.max_rect(), |ui| { + // Bound the cross-axis before laying out any part. Otherwise a later native + // button can grow the row after its earlier, shorter contents were positioned. + let name_height = ui.painter().layout_no_wrap(item.name.clone(), crate::fonts::semibold(t.font_label), t.text).size().y; + let setting_height = ui.painter().layout_no_wrap(item.setting.clone(), egui::FontId::monospace(t.font_small), t.text_dim).size().y; + let height = t.control_height.max(ui.spacing().interact_size.y).max(name_height).max(setting_height); + let size = vec2(ui.available_width(), height); + ui.allocate_ui_with_layout(size, egui::Layout::left_to_right(egui::Align::Center), |ui| { + ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend); + ui.spacing_mut().item_spacing.x = t.space_6; + ui.spacing_mut().interact_size.y = height; + let disc_size = t.space_24 - t.space_4; + let (disc_rect, _) = ui.allocate_exact_size(vec2(disc_size, disc_size), egui::Sense::hover()); + ui.painter().circle_filled(disc_rect.center(), disc_rect.width() / 2.0, disc); + crate::icons::paint_icon(ui.painter(), disc_rect.shrink(t.space_3), item.kind.icon(), 1.0); + scenario::publish_target(&target(item, "icon"), disc_rect); + let name = ui.label(RichText::new(&item.name).size(t.font_label).semibold().color(t.text)); + scenario::publish_target(&target(item, "name"), name.rect); + if !item.setting.is_empty() { + let text = RichText::new(&item.setting).monospace().size(t.font_small).color(t.text_dim); + let response = if item.editable { super::button(ui, text, Button::Ghost) } else { ui.label(text) }; + scenario::publish_target(&target(item, "setting"), response.rect); + if item.editable && response.clicked() { + action = Some(StatusAction::Edit(item.id.clone())); + } + } + if item.has_key { + let open = state.open_key.as_deref() == Some(&item.id); + let label = crate::i18n::format("ui.viewport_status_key", &[("name", &item.name)]); + if icon_action(ui, item, "key", "chevron", &label, &label, open).clicked() { + state.open_key = if open { None } else { Some(item.id.clone()) }; + } + } + let label = crate::i18n::format("ui.viewport_status_clear", &[("name", &item.name)]); + let hint = crate::i18n::format("ui.viewport_status_clear_hint", &[("name", &item.name)]); + if icon_action(ui, item, "close", "close", &label, &hint, false).clicked() { + action = Some(StatusAction::Clear(item.id.clone())); + } + }); + }) + .response; + let focus = ui.interact(response.rect, Id::new(target(item, "item")), egui::Sense::focusable_noninteractive()); + focus.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, ui.is_enabled(), format!("{} {}", item.name, item.setting))); + if focus.has_focus() { + ui.painter().rect_stroke(response.rect.expand(t.space_3), frame.corner_radius, ui.visuals().selection.stroke, egui::StrokeKind::Outside); + } + scenario::publish_target(&target(item, "item"), response.rect); + (response.rect, action) +} + +/// One oldest-first row. Only actual pills claim input; empty viewport space stays free. +pub(crate) fn viewport_status_row( + ctx: &egui::Context, + free: Rect, + items: &[StatusItem], + state: &mut StatusPresentation, + mut key_contents: impl FnMut(&mut Ui, &str), +) -> Vec { + if items.is_empty() { + state.open_key = None; + return Vec::new(); + } + if !items.iter().any(|item| item.has_key && state.open_key.as_deref() == Some(&item.id)) { + state.open_key = None; + } + let t = Tokens::get(); + let container = Container::new(ctx, Surface::ViewportStatus); + let mut actions = Vec::new(); + let mut key_anchor = None; + let row = container + .area(Id::new("viewport_status_row")) + .movable(false) + .pivot(egui::Align2::CENTER_TOP) + .fixed_pos(egui::pos2(free.center().x, free.top() + t.space_8)) + .show(ctx, |ui| { + ui.with_layout(egui::Layout::left_to_right(egui::Align::Min), |ui| { + ui.spacing_mut().item_spacing.x = t.space_8; + for item in items { + let (rect, action) = viewport_status_item(ui, item, state); + if state.open_key.as_deref() == Some(&item.id) { + key_anchor = Some((rect.left_bottom(), item.id.as_str())); + } + if let Some(action) = action { + actions.push(action); + } + } + }); + }); + scenario::publish_rect("viewport_status:row", row.response.rect); + scenario::publish_count("viewport_status:count", items.len() as f64); + if let Some((anchor, id)) = key_anchor { + let card = Container::new(ctx, Surface::Popup); + let result = card.area(Id::new("viewport_status_key")).movable(false).fixed_pos(anchor + vec2(0.0, t.space_6)).show(ctx, |ui| { + let frame = card.frame(ctx, t.overlay, crate::frame::Side::Left).inner_margin(t.space_12); + card.show_frame(ui, frame, free, |ui| key_contents(ui, id)); + }); + scenario::publish_target("viewport_status:card", result.response.rect); + } + actions +} diff --git a/crates/ui-egui/src/viewport.rs b/crates/ui-egui/src/viewport.rs index 5428cdbb9..e3ec72d0b 100644 --- a/crates/ui-egui/src/viewport.rs +++ b/crates/ui-egui/src/viewport.rs @@ -4724,6 +4724,7 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) { axis_view(app, ui, rect); crate::view_angles::show(app, ui, rect); crate::navigation_bar_view::show(app, ui, rect); + crate::viewport_status_fixture::show(app, ui.ctx(), rect); // The notices and the agent chip first, so the 3D mouse picture can keep clear of them. let toasts = transient_messages(app, ui, rect); if app.preferences.space_mouse_in_view diff --git a/crates/ui-egui/src/viewport_overlays_tests.rs b/crates/ui-egui/src/viewport_overlays_tests.rs index 173804862..0b04834c4 100644 --- a/crates/ui-egui/src/viewport_overlays_tests.rs +++ b/crates/ui-egui/src/viewport_overlays_tests.rs @@ -1,7 +1,198 @@ use super::*; use crate::{scenario::Harness, shell::LayoutMode}; +#[test] +fn viewport_status_specimens_clear_and_open_keys_without_engine_changes() { + let mut h = Harness::new(); + h.call("ui.status_fixture", json!({"preset":"row"})); + h.frames(4); + let zebra = crate::scenario::rect_of("viewport_status:zebra:item").unwrap(); + let section = crate::scenario::rect_of("viewport_status:section:item").unwrap(); + assert!(zebra.right() < section.left()); + assert!((zebra.center().y - section.center().y).abs() < 1.0, "single row: {zebra:?}, {section:?}"); + assert!(crate::scenario::rect_of("viewport_status:zebra:key").is_none()); + assert!(h.app.session.analysis.is_none()); + h.step(&json!({"click":{"handle":"viewport_status:zebra:close"}})).unwrap(); + h.frames(2); + assert!(crate::scenario::rect_of("viewport_status:zebra:item").is_none()); + assert!(crate::scenario::rect_of("viewport_status:section:item").is_some()); + h.call("ui.status_fixture", json!({"preset":"key"})); + h.frames(4); + h.step(&json!({"click":{"handle":"viewport_status:draft:key"}})).unwrap(); + h.frames(3); + let item = crate::scenario::rect_of("viewport_status:draft:item").unwrap(); + let card = crate::scenario::rect_of("viewport_status:card").unwrap(); + assert!(card.top() > item.bottom()); + assert!((card.left() - item.left()).abs() < 1.0); + h.step(&json!({"key":"Enter"})).unwrap(); + h.frames(2); + assert!(crate::scenario::rect_of("viewport_status:card").is_none(), "focused Ghost key toggles with Enter"); + h.step(&json!({"key":"Space"})).unwrap(); + h.frames(2); + assert!(crate::scenario::rect_of("viewport_status:card").is_some(), "focused Ghost key toggles with Space"); +} + +#[test] +fn viewport_status_kinds_keep_shape_outline_and_typography_across_themes() { + use crate::ui_kit::{StatusItem, StatusKind, StatusPresentation, viewport_status_item}; + let previous = (crate::theme::is_dark(), crate::theme::vision()); + assert_ne!(StatusKind::Mode.icon(), StatusKind::Result.icon()); + assert_ne!(StatusKind::Result.icon(), StatusKind::Attention.icon()); + for dark in [false, true] { + for vision in crate::theme::ColorVision::ALL { + crate::theme::set_dark(dark); + crate::theme::set_vision(vision); + let t = Tokens::get(); + for (kind, outline) in [(StatusKind::Mode, t.accent), (StatusKind::Result, t.border), (StatusKind::Attention, t.warning)] { + let ctx = crate::fonts::test_context(); + let item = StatusItem { id: "test".into(), kind, name: "Draft".into(), setting: "Z · 1°".into(), has_key: true, editable: false }; + let output = crate::test_support::frame(&ctx, egui::RawInput::default(), |ui| { + viewport_status_item(ui, &item, &mut StatusPresentation::default()); + }); + let (mut border, mut mono, mut name) = (false, false, false); + for shape in &output.shapes { + crate::test_support::each_shape(&shape.shape, &mut |shape| match shape { + Shape::Rect(rect) if rect.fill == t.overlay && rect.stroke.color == outline => border = true, + Shape::Text(text) if text.galley.job.text == item.setting => { + mono = text.galley.job.sections.first().is_some_and(|s| s.format.font_id.family == egui::FontFamily::Monospace); + } + Shape::Text(text) if text.galley.job.text == item.name => { + name = text.galley.job.sections.first().is_some_and(|s| s.format.font_id == crate::fonts::semibold(t.font_label)); + } + _ => {} + }); + } + assert!(border && mono && name, "{dark:?} {vision:?} {kind:?}: outline {border}, mono {mono}, name {name}"); + } + } + } + crate::theme::set_dark(previous.0); + crate::theme::set_vision(previous.1); +} + +#[test] +fn viewport_status_every_part_is_centred_within_its_pill_in_every_theme() { + use crate::ui_kit::{StatusItem, StatusKind, StatusPresentation, viewport_status_item}; + let previous = (crate::theme::is_dark(), crate::theme::vision()); + for dark in [false, true] { + for vision in crate::theme::ColorVision::ALL { + crate::theme::set_dark(dark); + crate::theme::set_vision(vision); + for kind in [StatusKind::Mode, StatusKind::Result, StatusKind::Attention] { + for (name, setting, has_key, editable) in [ + ("Zebra", "12 stripes", false, false), + ("A longer surface analysis name", "R 1234.5 mm", true, false), + ("Mass centre", "", false, false), + ("Draft", "Z · 1°", true, true), + ] { + let ctx = crate::fonts::test_context(); + let item = StatusItem { id: "centred".into(), kind, name: name.into(), setting: setting.into(), has_key, editable }; + let output = crate::test_support::frame(&ctx, egui::RawInput::default(), |ui| { + viewport_status_item(ui, &item, &mut StatusPresentation::default()); + }); + let pill = crate::scenario::rect_of("viewport_status:centred:item").unwrap(); + let centre = pill.center().y; + let mut parts = vec!["icon", "name", "close", "close_glyph"]; + if !setting.is_empty() { + parts.push("setting"); + } + if has_key { + parts.extend(["key", "key_glyph"]); + } + for part in parts { + let rect = crate::scenario::rect_of(&format!("viewport_status:centred:{part}")).unwrap(); + assert!((rect.center().y - centre).abs() <= 0.5, "{dark:?} {vision:?} {kind:?} {name} {part}: {rect:?}, pill {pill:?}"); + assert!(pill.contains_rect(rect), "{part} stays inside its pill"); + } + let mut text_centres = Vec::new(); + for shape in &output.shapes { + crate::test_support::each_shape(&shape.shape, &mut |shape| { + if let Shape::Text(text) = shape + && (text.galley.job.text == name || (!setting.is_empty() && text.galley.job.text == setting)) + { + text_centres.push(text.pos.y + text.galley.size().y / 2.0); + } + }); + } + assert_eq!(text_centres.len(), if setting.is_empty() { 1 } else { 2 }); + assert!( + text_centres.iter().all(|y| (*y - centre).abs() <= 0.5), + "painted text must share the pill centre: {text_centres:?}, {pill:?}" + ); + } + } + } + } + crate::theme::set_dark(previous.0); + crate::theme::set_vision(previous.1); +} + // These tests inspect shapes without submitting their texture uploads to a renderer. +#[test] +fn viewport_status_close_hover_has_a_theme_fill_and_native_space_action_in_every_mode() { + use crate::ui_kit::{StatusAction, StatusItem, StatusKind, StatusPresentation, viewport_status_item}; + + fn paint( + ctx: &egui::Context, + item: &StatusItem, + state: &mut StatusPresentation, + events: Vec, + ) -> (egui::FullOutput, Option) { + let mut action = None; + let mut output = crate::test_support::frame(ctx, egui::RawInput { events, focused: true, ..Default::default() }, |ui| { + action = viewport_status_item(ui, item, state).1; + }); + output.textures_delta.clear(); + (output, action) + } + + fn has_hover_fill(output: &egui::FullOutput, target: Rect, t: Tokens) -> bool { + let mut found = false; + for shape in &output.shapes { + crate::test_support::each_shape(&shape.shape, &mut |shape| { + if let Shape::Rect(rect) = shape { + found |= rect.rect == target && rect.fill == t.hover && rect.corner_radius == t.control_radius.into(); + } + }); + } + found + } + + let previous = (crate::theme::is_dark(), crate::theme::vision()); + for dark in [false, true] { + for vision in crate::theme::ColorVision::ALL { + crate::theme::set_dark(dark); + crate::theme::set_vision(vision); + let t = Tokens::get(); + let ctx = crate::fonts::test_context(); + let item = StatusItem { + id: "hover".into(), + kind: StatusKind::Mode, + name: "Zebra".into(), + setting: "12 stripes".into(), + has_key: false, + editable: false, + }; + let mut state = StatusPresentation::default(); + let (rest, action) = paint(&ctx, &item, &mut state, vec![]); + let close = crate::scenario::rect_of("viewport_status:hover:close").unwrap(); + assert!(action.is_none()); + assert!(!has_hover_fill(&rest, close, t), "rest must stay quiet: {dark:?} {vision:?}"); + let (hover, action) = paint(&ctx, &item, &mut state, vec![egui::Event::PointerMoved(close.center())]); + assert!(action.is_none(), "hover cannot clear the item"); + assert!(has_hover_fill(&hover, close, t), "close must expose its token hover target: {dark:?} {vision:?}"); + assert_eq!(hover.platform_output.cursor_icon, egui::CursorIcon::PointingHand); + paint(&ctx, &item, &mut state, crate::test_support::pointer(close.center(), true)); + let (_, clicked) = paint(&ctx, &item, &mut state, crate::test_support::pointer(close.center(), false)); + assert_eq!(clicked, Some(StatusAction::Clear(item.id.clone()))); + let (_, keyboard) = paint(&ctx, &item, &mut state, crate::test_support::key(egui::Key::Space)); + assert_eq!(keyboard, Some(StatusAction::Clear(item.id.clone())), "hover decoration must preserve native Space activation"); + } + } + crate::theme::set_dark(previous.0); + crate::theme::set_vision(previous.1); +} + fn draw(ctx: &egui::Context, paint: impl FnMut(&mut egui::Ui)) -> egui::FullOutput { let mut output = ctx.run_ui(egui::RawInput::default(), paint); output.textures_delta.clear(); diff --git a/crates/ui-egui/src/viewport_status_fixture.rs b/crates/ui-egui/src/viewport_status_fixture.rs new file mode 100644 index 000000000..dcccc1c8e --- /dev/null +++ b/crates/ui-egui/src/viewport_status_fixture.rs @@ -0,0 +1,87 @@ +//! Explicit UI specimen source for scenarios and live component review. Never engine state. +use crate::ui_kit::{StatusAction, StatusItem, StatusKind, StatusPresentation}; +use serde_json::{Value, json}; + +#[derive(Default)] +pub(crate) struct Fixture { + items: Vec, + presentation: StatusPresentation, +} + +fn item(id: &str, kind: StatusKind, label: &str, setting: String, has_key: bool) -> StatusItem { + StatusItem { id: id.into(), kind, name: crate::i18n::tr(label).into(), setting, has_key, editable: false } +} + +/// Presets are bounded, named specimens rather than arbitrary user-provided widget state. +pub(crate) fn control(app: &mut crate::SolveApp, params: &Value) -> Result { + let preset = params.get("preset").and_then(Value::as_str).ok_or("missing `preset`")?; + let zebra = || item("zebra", StatusKind::Mode, "Zebra", crate::i18n::format("ui.viewport_status_stripes", &[("count", "12")]), false); + let section = || item("section", StatusKind::Mode, "Section", "Z 20 mm".into(), false); + let result = || item("radius", StatusKind::Result, "ui.viewport_status_minimum_radius", "0.8 mm".into(), false); + let attention = || { + item( + "interference", + StatusKind::Attention, + "cmd.inspect_interference", + crate::i18n::format("ui.viewport_status_pairs", &[("count", "3")]), + false, + ) + }; + let items = match preset { + "off" => Vec::new(), + "mode" => vec![zebra()], + "result" => vec![result()], + "attention" => vec![attention()], + "row" => vec![zebra(), section()], + "kinds" => vec![zebra(), result(), attention()], + "key" => vec![item("draft", StatusKind::Mode, "ui.draft", "Z · 1°".into(), true)], + _ => return Err("preset must be off, mode, result, attention, row, kinds or key".into()), + }; + app.viewport_status_fixture = Fixture { items, presentation: StatusPresentation::default() }; + Ok(json!({"preset": preset, "count": app.viewport_status_fixture.items.len()})) +} + +pub(crate) fn show(app: &mut crate::SolveApp, ctx: &egui::Context, viewport: egui::Rect) { + if app.viewport_status_fixture.items.is_empty() { + return; + } + let content = crate::shell::content_rect(app, viewport); + if !content.is_finite() || !content.is_positive() { + return; + } + let mut free = crate::shell::workspace_content(app, content); + for card in &app.shell.cards { + free.min.y = free.top().max(card.bottom()).min(free.bottom()); + } + if let Some(layout) = &app.viewport.layout { + free.max.x = free.right().min(layout.axis_view.left()).max(free.left()); + } + if !free.is_finite() || !free.is_positive() { + return; + } + let fixture = &mut app.viewport_status_fixture; + let actions = crate::ui_kit::viewport_status_row(ctx, free, &fixture.items, &mut fixture.presentation, |ui, _| { + let t = crate::theme::Tokens::get(); + ui.label(crate::i18n::tr("cmd.inspect_draft")); + ui.label(egui::RichText::new(format!("{} (0.00, 0.00, 1.00)", crate::i18n::tr("ui.pull_direction"))).monospace().color(t.text_dim)); + for (index, (colour, label)) in t.analysis.draft.into_iter().zip(["≥ 1.0°", "−1.0° … 1.0°", "≤ −1.0°"]).enumerate() { + ui.horizontal(|ui| { + let (rect, _) = ui.allocate_exact_size(egui::vec2(t.space_12, t.space_12), egui::Sense::hover()); + ui.painter().rect_filled(rect, t.radius_sm, crate::theme::srgb(colour)); + if index == 2 && t.analysis.hatch { + let painter = ui.painter().with_clip_rect(rect); + for offset in [-t.space_8, -t.space_4, 0.0, t.space_4, t.space_8] { + let from = rect.left_bottom() + egui::vec2(offset, 0.0); + painter.line_segment([from, from + egui::vec2(rect.height(), -rect.height())], ui.visuals().selection.stroke); + } + } + ui.label(label); + }); + } + }); + for action in actions { + if let StatusAction::Clear(id) = action { + fixture.items.retain(|item| item.id != id); + } + } +} diff --git a/crates/ui-egui/tests/icon_audit.rs b/crates/ui-egui/tests/icon_audit.rs index a9ebb47a4..52baff020 100644 --- a/crates/ui-egui/tests/icon_audit.rs +++ b/crates/ui-egui/tests/icon_audit.rs @@ -176,6 +176,12 @@ fn requested_menu_icons_have_artwork_and_match_manifest() { h.app.session.run_script(&solidcraft_engine::sample::script()).unwrap(); h.frames(3); let mut requested = BTreeMap::new(); + for preset in ["kinds", "key"] { + h.call("ui.status_fixture", json!({"preset":preset})); + h.frames(3); + collect(&mut h, "viewport status specimens", &mut requested); + } + h.call("ui.status_fixture", json!({"preset":"off"})); collect(&mut h, "initial browser and timeline", &mut requested); assistant(&mut h, &mut requested); diff --git a/crates/ui-egui/tests/scenarios/viewport_status_item.json b/crates/ui-egui/tests/scenarios/viewport_status_item.json new file mode 100644 index 000000000..38a4422fb --- /dev/null +++ b/crates/ui-egui/tests/scenarios/viewport_status_item.json @@ -0,0 +1,228 @@ +[ + {"note": "UI-kit specimens only: all three kinds, rest, close hover, native keyboard focus and key card in both themes and every colour-vision mode. Engine integration is delivered by later issues."}, + {"call": "ui.prefs","params": {"theme": "light","color_vision": "off"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-light-off"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-light-off"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-light-off"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-light-off"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-light-off"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-light-off"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "light","color_vision": "protan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-light-protan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-light-protan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-light-protan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-light-protan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-light-protan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-light-protan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "light","color_vision": "deutan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-light-deutan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-light-deutan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-light-deutan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-light-deutan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-light-deutan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-light-deutan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "light","color_vision": "tritan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-light-tritan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-light-tritan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-light-tritan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-light-tritan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-light-tritan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-light-tritan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "dark","color_vision": "off"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-dark-off"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-dark-off"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-dark-off"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-dark-off"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-dark-off"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-dark-off"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "dark","color_vision": "protan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-dark-protan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-dark-protan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-dark-protan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-dark-protan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-dark-protan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-dark-protan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "dark","color_vision": "deutan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-dark-deutan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-dark-deutan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-dark-deutan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-dark-deutan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-dark-deutan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-dark-deutan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.prefs","params": {"theme": "dark","color_vision": "tritan"}}, + {"call": "ui.status_fixture","params": {"preset": "row"}}, + {"frames": 4}, + {"expect": {"count": {"name": "viewport_status:count","value": 2}}}, + {"shot": "viewport-status-row-dark-tritan"}, + {"move": {"handle": "viewport_status:zebra:close"}}, + {"frames": 60}, + {"shot": "viewport-status-hover-dark-tritan"}, + {"click": {"handle": "viewport_status:zebra:close"}}, + {"frames": 2}, + {"expect": {"count": {"name": "viewport_status:count","value": 1}}}, + {"call": "ui.status_fixture","params": {"preset": "result"}}, + {"frames": 3}, + {"shot": "viewport-status-result-dark-tritan"}, + {"call": "ui.status_fixture","params": {"preset": "attention"}}, + {"frames": 3}, + {"shot": "viewport-status-attention-dark-tritan"}, + {"call": "ui.status_fixture","params": {"preset": "key"}}, + {"frames": 4}, + {"click": {"handle": "viewport_status:draft:key"}}, + {"frames": 3}, + {"shot": "viewport-status-key-dark-tritan"}, + {"key": "Tab"}, + {"key": "Tab"}, + {"frames": 2}, + {"shot": "viewport-status-focus-dark-tritan"}, + {"click": {"handle": "viewport_status:draft:close"}}, + {"frames": 2}, + {"call": "ui.status_fixture","params": {"preset": "off"}} +] diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 9a8e2cb40..2f0b97ab8 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -1,5 +1,12 @@ # Control protocol +For UI-kit review, `ui.status_fixture {"preset":"mode"}` shows bounded status +specimens in the real viewport. Presets are `off`, `mode`, `result`, `attention`, +`row`, `kinds` and `key`; the reply carries the preset and item count. This +scenario fixture does not change engine state or open a dialog. `off` clears it. +The published `viewport_status::item`, `:setting`, `:key` and `:close` handles +support the ordinary `ui.at`, `ui.move`, `ui.click` and keyboard controls. + The control channel is **on by default**. SolidCraft listens on `127.0.0.1` only, for JSON lines, so agents can drive the app without a launch flag. Every connection still needs this launch's token (below); nothing else on the machine, and nothing off it, can send a command. diff --git a/docs/ui-container-audit.md b/docs/ui-container-audit.md index a149096aa..2b0f205aa 100644 --- a/docs/ui-container-audit.md +++ b/docs/ui-container-audit.md @@ -49,6 +49,7 @@ windows use the shared composition, including its header and fixed outer frame. | Dimension values, canvas placement values, canvas feedback and History resize seam | `dim_view`, `sketch_dims`, `canvas`, `timeline_left` | Model/control-anchored overlays; retain their coordinates rather than becoming docks | | Status and loading/progress messages | `viewport`, `open_meshing` | Notification surfaces independent of layout | | Navigation bar | `navigation_bar_view` | Measured single-row Navigation surface; upward Popup menus use kit list rows; shell supplies the free canvas bounds | +| Persistent viewport status items | `ui_kit::viewport_status` | Content-hugging ViewportStatus pill surface; anchored row and Popup key cards, independent of workspace docking | | OK and Cancel in the view's corner | `view_confirm` | Navigation surface in its own area; the viewport layout reserves its corner and the shell counts it as covered | | Home, model viewport, Render canvas and native Assistant window content | `home`, `lib`, `agent_chat/panel` | Central content hosts, not floating workspace panels | | Loading input shield | `file_load` | Explicit input shield; must remain interactive while CAD input is blocked | diff --git a/docs/ui-kit.md b/docs/ui-kit.md index 6db5a7a4a..b200fd69b 100644 --- a/docs/ui-kit.md +++ b/docs/ui-kit.md @@ -1,5 +1,12 @@ # SolidCraft UI kit +`viewport_status_item` and `viewport_status_row` draw persistent viewport pills on +`Surface::ViewportStatus`. Callers supply translated names, formatted settings, +kind, stable identity and key availability, and dispatch returned clear/edit actions. +The row keeps supplied order and anchors to the top centre of the free viewport. +Its presentation state only remembers which key card is open. The `ui.status_fixture` +control method provides named specimens for UI scenarios and live visual review. + `crates/ui-egui/src/ui_kit/` contains the tokenised controls used by feature dialogs, preferences, manager cards, prompts, context menus and the sketch palette. Import through `crate::ui_kit::{...}`. Most controls are crate-visible; the container API is public so platform apps use the same hosts.