forked from 1b-agent/opencadstudio-upstream
The node library leaves the overlay and becomes a dock panel (PanelId:: NodeGraph), docked on the right the first time the graph opens and movable like any other panel; closing it closes the graph. It follows the block palette's layout: title bar, then a search box with New / Open / Save beside it, then the categories, of which only Objects starts open. Entries are clicked (placed at the canvas top-left) or dragged onto the canvas. The title bar (title, auto-collapse pin, close, drag to re-dock), the toolbar icon button and the panel frame were copied across Properties, Block Palette, External References and Browser; they are now dock::title_bar, dock::tool_button and dock::frame, used by all of them. Block Palette's two tool buttons gain tooltips, and External References' Auto / Close tooltips are now translated. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
380 lines
14 KiB
Rust
380 lines
14 KiB
Rust
//! Docked "Insert Block" panel: a searchable grid of block thumbnails that
|
|
//! inserts a clicked block, mirrors the existing `InsertBlockCommand` flow.
|
|
|
|
use crate::app::Message;
|
|
use crate::modules::IconKind;
|
|
use crate::scene::model::wire_model::WireModel;
|
|
use crate::ui::dock::PanelId;
|
|
use iced::widget::canvas::{Frame, Path, Program, Stroke};
|
|
use iced::widget::{button, canvas, column, container, row, scrollable, text, text_input};
|
|
use iced::{Background, Border, Color, Element, Fill, Length, Theme};
|
|
|
|
const TOOL_H: f32 = 22.0;
|
|
/// Character budget for a block card's label so all rows stay one line.
|
|
/// Fits the narrowest card (Small = 3 per row) at size 11 without wrapping.
|
|
const MAX_LABEL_CHARS: usize = 12;
|
|
/// Fixed single-line height of a card's label. Clips any text that still
|
|
/// won't fit so every cell in a grid row shares the same height.
|
|
const LABEL_LINE_H: f32 = 16.0;
|
|
|
|
/// Every message the block palette emits. Wrapped in `Message::BlockPalette`.
|
|
#[derive(Debug, Clone)]
|
|
pub enum BlockPaletteMsg {
|
|
Search(String),
|
|
CyclePreviewSize,
|
|
PickFile,
|
|
Insert(String),
|
|
Refresh,
|
|
FilePicked(Result<std::path::PathBuf, String>),
|
|
}
|
|
|
|
/// Thumbnail box sizes for the three preview-size settings.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
|
pub enum PreviewSize {
|
|
#[default]
|
|
Small,
|
|
Medium,
|
|
Large,
|
|
}
|
|
|
|
impl PreviewSize {
|
|
/// Number of cards per grid row.
|
|
fn columns(self) -> usize {
|
|
match self {
|
|
PreviewSize::Small => 3,
|
|
PreviewSize::Medium => 2,
|
|
PreviewSize::Large => 1,
|
|
}
|
|
}
|
|
/// Height (px) of the thumbnail box inside each card.
|
|
fn box_height(self) -> f32 {
|
|
match self {
|
|
PreviewSize::Small => 56.0,
|
|
PreviewSize::Medium => 84.0,
|
|
PreviewSize::Large => 120.0,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Advance to the next preview size (Small → Medium → Large → Small).
|
|
pub fn cycle_preview_size(s: PreviewSize) -> PreviewSize {
|
|
match s {
|
|
PreviewSize::Small => PreviewSize::Medium,
|
|
PreviewSize::Medium => PreviewSize::Large,
|
|
PreviewSize::Large => PreviewSize::Small,
|
|
}
|
|
}
|
|
|
|
/// One block's cached preview wires.
|
|
pub struct BlockEntry {
|
|
pub name: String,
|
|
pub wires: Vec<WireModel>,
|
|
}
|
|
|
|
/// Panel state held on the app.
|
|
#[derive(Default)]
|
|
pub struct BlockPalette {
|
|
pub search: String,
|
|
pub preview_size: PreviewSize,
|
|
/// Cached (name, wires) pairs, rebuilt on refresh.
|
|
pub blocks: Vec<BlockEntry>,
|
|
/// Block name currently being placed (INSERT active), for the highlight.
|
|
pub placing: Option<String>,
|
|
/// Last known block-name list, for the cheap stale check.
|
|
pub cached_names: Vec<String>,
|
|
/// Document tab and block-definition revision that produced `blocks`.
|
|
/// Names alone are not enough: separate drawings can share block names,
|
|
/// and a block definition can change without being renamed.
|
|
pub source_tab_id: Option<u64>,
|
|
pub source_block_epoch: u64,
|
|
}
|
|
|
|
/// Canvas program that draws a block's wires fit-to-box inside its bounds.
|
|
struct BlockPreviewCanvas<'a> {
|
|
wires: &'a [WireModel],
|
|
}
|
|
|
|
impl<'a> Program<Message> for BlockPreviewCanvas<'a> {
|
|
type State = ();
|
|
|
|
fn draw(
|
|
&self,
|
|
_state: &(),
|
|
renderer: &iced::Renderer,
|
|
_theme: &Theme,
|
|
bounds: iced::Rectangle,
|
|
_cursor: iced::mouse::Cursor,
|
|
) -> Vec<canvas::Geometry> {
|
|
let mut frame = Frame::new(renderer, bounds.size());
|
|
let pad = 6.0;
|
|
let inner_w = (bounds.width - 2.0 * pad).max(1.0);
|
|
let inner_h = (bounds.height - 2.0 * pad).max(1.0);
|
|
let (mut minx, mut miny, mut maxx, mut maxy) =
|
|
(f32::INFINITY, f32::INFINITY, f32::NEG_INFINITY, f32::NEG_INFINITY);
|
|
let mut any = false;
|
|
for w in self.wires {
|
|
for p in &w.points {
|
|
if p[0].is_finite() && p[1].is_finite() {
|
|
minx = minx.min(p[0]);
|
|
miny = miny.min(p[1]);
|
|
maxx = maxx.max(p[0]);
|
|
maxy = maxy.max(p[1]);
|
|
any = true;
|
|
}
|
|
}
|
|
}
|
|
if !any {
|
|
// Placeholder box so an empty block still reads as a card.
|
|
let rect = Path::rectangle(iced::Point::new(pad, pad), iced::Size::new(inner_w, inner_h));
|
|
frame.fill(&rect, Color { r: 0.10, g: 0.10, b: 0.10, a: 1.0 });
|
|
return vec![frame.into_geometry()];
|
|
}
|
|
let span_x = (maxx - minx).max(1e-6);
|
|
let span_y = (maxy - miny).max(1e-6);
|
|
let scale = (inner_w / span_x).min(inner_h / span_y);
|
|
let ox = (bounds.width - span_x * scale) * 0.5;
|
|
let oy = (bounds.height - span_y * scale) * 0.5;
|
|
// World up → screen down; centre the fitted AABB.
|
|
let map = |x: f32, y: f32| iced::Point::new(ox + (x - minx) * scale, oy + (maxy - y) * scale);
|
|
// Solid fills first so strokes sit on top.
|
|
for w in self.wires {
|
|
let col = Color { r: w.color[0], g: w.color[1], b: w.color[2], a: 0.55 };
|
|
for tri in w.fill_tris.chunks(3) {
|
|
if tri.len() == 3 {
|
|
let path = Path::new(|p| {
|
|
p.move_to(map(tri[0][0], tri[0][1]));
|
|
p.line_to(map(tri[1][0], tri[1][1]));
|
|
p.line_to(map(tri[2][0], tri[2][1]));
|
|
p.close();
|
|
});
|
|
frame.fill(&path, col);
|
|
}
|
|
}
|
|
}
|
|
// Polylines, split into runs on NaN separators (NaN = polyline break).
|
|
for w in self.wires {
|
|
let col = Color { r: w.color[0], g: w.color[1], b: w.color[2], a: 1.0 };
|
|
let width = if w.line_weight_px > 1.5 { 2.0 } else { 1.0 };
|
|
let mut run: Vec<iced::Point> = Vec::new();
|
|
let flush = |frame: &mut Frame, run: &mut Vec<iced::Point>, col: Color, width: f32| {
|
|
if run.len() >= 2 {
|
|
let path = Path::new(|p| {
|
|
p.move_to(run[0]);
|
|
for &pt in &run[1..] {
|
|
p.line_to(pt);
|
|
}
|
|
});
|
|
frame.stroke(&path, Stroke::default().with_color(col).with_width(width));
|
|
}
|
|
run.clear();
|
|
};
|
|
for p in &w.points {
|
|
if p[0].is_finite() && p[1].is_finite() {
|
|
run.push(map(p[0], p[1]));
|
|
} else {
|
|
flush(&mut frame, &mut run, col, width);
|
|
}
|
|
}
|
|
flush(&mut frame, &mut run, col, width);
|
|
}
|
|
vec![frame.into_geometry()]
|
|
}
|
|
}
|
|
|
|
/// Build the docked panel element from the palette state.
|
|
pub fn view(palette: &BlockPalette, width: f32, auto_collapse: bool) -> Element<'_, Message> {
|
|
let query = palette.search.trim().to_lowercase();
|
|
let filtered: Vec<&BlockEntry> = palette
|
|
.blocks
|
|
.iter()
|
|
.filter(|block| query.is_empty() || block.name.to_lowercase().contains(&query))
|
|
.collect();
|
|
|
|
let title_bar = crate::ui::dock::title_bar(
|
|
PanelId::BlockPalette,
|
|
crate::t!("Block Palette").into_owned(),
|
|
auto_collapse,
|
|
);
|
|
|
|
let search_input = text_input(&crate::t!("Search blocks…"), &palette.search)
|
|
.on_input(|v| Message::BlockPalette(BlockPaletteMsg::Search(v)))
|
|
.padding([4, 8])
|
|
.size(12);
|
|
|
|
let header = row![
|
|
search_input,
|
|
icon_button(
|
|
IconKind::Svg(include_bytes!("../../../assets/icons/blocks/insert.svg")),
|
|
"Insert from file",
|
|
BlockPaletteMsg::PickFile,
|
|
),
|
|
icon_button(
|
|
IconKind::Svg(include_bytes!("../../../assets/icons/blocks/preview_size.svg")),
|
|
"Preview size",
|
|
BlockPaletteMsg::CyclePreviewSize,
|
|
),
|
|
]
|
|
.spacing(4)
|
|
.align_y(iced::Center);
|
|
|
|
let body: Element<'_, Message> = if filtered.is_empty() {
|
|
let msg = if palette.cached_names.is_empty() {
|
|
"No blocks in this drawing"
|
|
} else {
|
|
"No matches"
|
|
};
|
|
container(
|
|
text(crate::t!(msg))
|
|
.size(12)
|
|
.style(|theme: &Theme| iced::widget::text::Style {
|
|
color: Some(
|
|
theme
|
|
.palette()
|
|
.background
|
|
.base
|
|
.text
|
|
.scale_alpha(0.72),
|
|
),
|
|
}),
|
|
)
|
|
.center_x(Fill)
|
|
.center_y(Fill)
|
|
.width(Fill)
|
|
.height(Fill)
|
|
.into()
|
|
} else {
|
|
let mut col = column![].spacing(6);
|
|
for chunk in filtered.chunks(palette.preview_size.columns()) {
|
|
let mut r = row![].spacing(6).width(Fill);
|
|
for block in chunk {
|
|
r = r.push(block_card(palette, block));
|
|
}
|
|
col = col.push(r);
|
|
}
|
|
scrollable(
|
|
container(col).padding(iced::Padding {
|
|
top: 0.0,
|
|
right: 8.0,
|
|
bottom: 6.0,
|
|
left: 0.0,
|
|
}),
|
|
)
|
|
.width(Fill)
|
|
.height(Fill)
|
|
.into()
|
|
};
|
|
|
|
crate::ui::dock::frame(column![title_bar, header, body].spacing(6), width)
|
|
}
|
|
|
|
/// Theme-aware foreground/background pair for a block card.
|
|
///
|
|
/// Centralizes the card's text/background mapping so the contrast suite can
|
|
/// exercise the exact colors the UI renders (instead of re-implementing the
|
|
/// match). Normal cards use the `base` pair, hovered/pressed cards use the
|
|
/// `strong` pair, and the actively-placing card uses the `primary.base` pair.
|
|
pub(crate) fn block_card_colors(
|
|
theme: &Theme,
|
|
is_placing: bool,
|
|
status: button::Status,
|
|
) -> (Color, Color) {
|
|
let palette = theme.palette();
|
|
if is_placing {
|
|
(palette.primary.base.color, palette.primary.base.text)
|
|
} else {
|
|
match status {
|
|
button::Status::Hovered | button::Status::Pressed => {
|
|
(palette.background.strong.color, palette.background.strong.text)
|
|
}
|
|
_ => (
|
|
palette.background.base.color,
|
|
palette.background.base.text,
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Border color for a block card in a given state (exposed for contrast tests).
|
|
pub(crate) fn block_card_border(theme: &Theme, is_placing: bool) -> Color {
|
|
let palette = theme.palette();
|
|
if is_placing {
|
|
palette.primary.base.color
|
|
} else {
|
|
palette.background.neutral.color
|
|
}
|
|
}
|
|
|
|
/// Theme-aware foreground for the palette's header icon buttons.
|
|
///
|
|
/// Transparent resting state composites over the dock (`base`) background;
|
|
/// hovered/pressed state sits on the `strong` surface, so each state pairs
|
|
/// with its own background's text color to preserve contrast.
|
|
pub(crate) fn block_icon_button_text_color(theme: &Theme, status: button::Status) -> Color {
|
|
let palette = theme.palette();
|
|
match status {
|
|
button::Status::Hovered | button::Status::Pressed => palette.background.strong.text,
|
|
_ => palette.background.base.text,
|
|
}
|
|
}
|
|
|
|
fn block_card<'a>(palette: &'a BlockPalette, block: &'a BlockEntry) -> Element<'a, Message> {
|
|
let is_placing = palette.placing.as_deref() == Some(block.name.as_str());
|
|
let preview = canvas(BlockPreviewCanvas { wires: &block.wires })
|
|
.width(Fill)
|
|
.height(Length::Fixed(palette.preview_size.box_height()));
|
|
// Fixed height guarantees the label occupies exactly one line, so every
|
|
// cell in a row keeps the same height even for long names (the elide budget
|
|
// handles overflow, and this clips anything that still won't fit).
|
|
//
|
|
// NOTE: no explicit `.color(...)` here — the label inherits the button's
|
|
// `text_color` so normal/hover/placing states each get a theme-aware
|
|
// foreground with sufficient contrast on both light and dark themes.
|
|
// (A hardcoded `Color::WHITE` is unreadable on light themes.)
|
|
let label = text(crate::ui::text_util::elide(&block.name, MAX_LABEL_CHARS))
|
|
.size(11)
|
|
.width(Fill)
|
|
.height(Length::Fixed(LABEL_LINE_H))
|
|
.center();
|
|
let content = column![preview, label].spacing(4).padding(6);
|
|
button(content)
|
|
.on_press(Message::BlockPalette(BlockPaletteMsg::Insert(block.name.clone())))
|
|
.width(Fill)
|
|
.style(move |theme: &Theme, status| {
|
|
let (bg, fg) = block_card_colors(theme, is_placing, status);
|
|
let border = block_card_border(theme, is_placing);
|
|
button::Style {
|
|
background: Some(Background::Color(bg)),
|
|
border: Border {
|
|
color: border,
|
|
width: 1.0,
|
|
radius: 3.0.into(),
|
|
},
|
|
text_color: fg,
|
|
..Default::default()
|
|
}
|
|
})
|
|
.into()
|
|
}
|
|
|
|
fn icon_button<'a>(icon: IconKind, tip: &str, msg: BlockPaletteMsg) -> Element<'a, Message> {
|
|
let icon_el: Element<'_, Message> = match icon {
|
|
// No explicit color — inherits the button's theme-aware `text_color`
|
|
// so glyphs stay legible on light themes.
|
|
IconKind::Glyph(s) => text(s).size(15).into(),
|
|
IconKind::Svg(bytes) => crate::ui::icons::semantic(bytes, TOOL_H),
|
|
};
|
|
crate::ui::dock::tool_button(icon_el, crate::t!(tip).into_owned(), Message::BlockPalette(msg))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn preview_size_cycles() {
|
|
assert_eq!(cycle_preview_size(PreviewSize::Small), PreviewSize::Medium);
|
|
assert_eq!(cycle_preview_size(PreviewSize::Medium), PreviewSize::Large);
|
|
assert_eq!(cycle_preview_size(PreviewSize::Large), PreviewSize::Small);
|
|
}
|
|
}
|