Merge main into Select-Color-Redesign

Resolve conflicts with the new gradient and graphic-attributes colour
targets: keep main's targets and menu handling, routed through the new
ColorPicker state; adapt dock/view.rs to `color_picker`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013rGmDUNr1hUf4zo1X3dak8
This commit is contained in:
Claude committed 2026-10-12 19:29:37 +00:00
commit 0904661192
220 files changed
+37313 -5826

No files matched your search

+50 -11
View File
@@ -9,6 +9,7 @@ autotests = false
[workspace]
members = [
"crates/ocs_plugin_api",
"crates/ocs_save",
"crates/ocs_web_worker",
"crates/dwg-thumbnailer",
"crates/dwg-thumbnailer-win",
@@ -34,19 +35,34 @@ rfd = "0.17"
clap = { version = "4", features = ["derive", "string"] }
env_logger = "0.11"
log = "0.4"
codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "8189f83", features = ["serde"] }
kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "71770e1", features = ["acis", "offset"] }
kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "71770e1" }
graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "f4fdb80" }
codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "3ec70a2", features = ["serde"] }
kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "e710727", features = ["acis", "offset"] }
kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "e710727" }
graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "338a973" }
dwg-thumbnailer = { path = "crates/dwg-thumbnailer" }
# Shared SAVE serialization dispatch + web-worker wire format: one
# implementation for the inline (fallback/native) path and the worker path.
ocs_save = { path = "crates/ocs_save" }
flate2 = "1"
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp", "tiff"] }
# Raster decode set: png/jpeg/bmp/tiff plus webp/gif (both pure-Rust in
# image 0.25, so the wasm target stays C-free). Every format named here must
# also appear in the IMAGE picker filter (io::pick_image_file) and the web
# drop filter (io::web_drop::is_image_name).
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp", "tiff", "webp", "gif"] }
hayro = "0.7.1"
kurbo = "0.13"
# DWF/DWFx packages, their XPS pages and DWF/DGN underlay rasters.
zip = { version = "8", default-features = false, features = ["deflate"] }
roxmltree = "0.20"
tiny-skia = "0.11"
# PDF writer shared by desktop export and the web export/preview/print path.
printpdf = { version = "0.9.1", default-features = false, features = ["images"] }
# TrueType subsetting for searchable PDF text (same version printpdf itself
# uses, so no new binary enters the lockfile). Same feature set as printpdf's
# own allsorts use (pure-Rust flate backend) — the defaults would drag in the
# libz-sys C dependency. Pure Rust, so the web build embeds
# the same subsets.
allsorts = { version = "0.16", default-features = false, features = ["flate2_rust"] }
# Rasterises assets/logo.svg into the window icon at startup, so the taskbar
# icon comes from the same file every other build target does. Already in the
# tree behind iced's svg feature; named here only to use it directly.
@@ -102,12 +118,6 @@ meshopt = "0.6.2"
i18n-embed = { version = "0.16", features = ["desktop-requester"] }
rayon = "1"
open = "5"
printpdf = { version = "0.9.1", default-features = false, features = ["images"] }
# TrueType subsetting for searchable PDF text (same version printpdf itself
# uses, so no new binary enters the lockfile). Same feature set as printpdf's
# own allsorts use (pure-Rust flate backend) — the defaults would drag in the
# libz-sys C dependency. Native-only like printpdf.
allsorts = { version = "0.16", default-features = false, features = ["flate2_rust"] }
ureq = { version = "3", default-features = false, features = ["rustls", "platform-verifier", "win-system-proxy"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -132,29 +142,58 @@ web-sys = { version = "=0.3.85", features = [
"File",
"FileSystemDirectoryHandle",
"FileSystemFileHandle",
# FileSystemFileHandle derefs to FileSystemHandle for the `name()`
# getter the in-place save (io::fs_access) reads off a picked handle.
"FileSystemHandle",
"FileSystemGetDirectoryOptions",
"FileSystemGetFileOptions",
"FileSystemWritableFileStream",
"WritableStream",
"Url",
"Response",
# The wasm remote-raster fetch (image_model::fetch_remote_web) builds a
# `Request` with an `AbortController` signal for its deadline; the fetch
# rejection is classified via `DomException` (AbortError = timeout) and
# the body size is pre-checked against the Content-Length `Headers`.
"Request",
"RequestInit",
"AbortController",
"AbortSignal",
"DomException",
"Headers",
"Worker",
"WorkerOptions",
"WorkerType",
"MessageEvent",
"ErrorEvent",
"Clipboard",
# The web image paste reads `navigator.clipboard.read()` items
# (sys::read_clipboard_image): their `types()`/`getType()` surface lives
# on ClipboardItem.
"ClipboardItem",
"KeyboardEvent",
"KeyboardEventInit",
"EventInit",
"EventTarget",
"BeforeUnloadEvent",
# COLORSCHEME SYSTEM resolves prefers-color-scheme through a media
# query listener read at boot and on every re-run.
"MediaQueryList",
"console",
"Node",
"HtmlElement",
"HtmlCanvasElement",
"CanvasRenderingContext2d",
"ImageData",
"DragEvent",
"DataTransfer",
"FileList",
"Event",
"ReadableStreamDefaultReader",
"ReadableStream",
# The ?file= boot deep link reads location.search and compares the link's
# origin against the page's (io::web_link).
"Location",
] }
iced = { git = "https://github.com/iced-rs/iced.git", rev = "23604ff22ab0aad9e00b9327cb7b8546ed84db39", features = ["webgl", "fira-sans"] }