bflatasticandClaude Opus 5.5
d6eb526186
Dragging a bounding-box handle of area type with the Selection tool now
resizes the type area: the text reflows at its own size (threads too)
instead of being scaled, and History says "Resize Type Area". With other
objects selected they scale as before while the area type resizes its
frame. Direct Selection picks the frame's corners and edges and reshapes
the area ("Reshape Type Area", new command text.reshapeArea), and the
selected frame's anchors and outline show. Area Type Options gains Width
and Height. Point type, rotation, Object > Transform > Scale, the Scale
tool and the Transform panel still transform the type.
Root cause: every handle drag previewed object.transform, which folds the
matrix into the text's xf (TextObject::transform), so area type scaled its
glyphs; and Direct Selection's anchor hit test only looked at paths, so the
frame's corners could not be picked. object.transform now takes
typeAreas, which reshapes the frame in text space (xf^-1 * m * xf), and
the tools use it and text.reshapeArea.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
48 lines
1.8 KiB
Rust
48 lines
1.8 KiB
Rust
//! The generic parameter dialog (`ui.paramDialog`): edits a command's parameters (`__command`,
|
|
//! headed `__label`) and runs it on OK.
|
|
|
|
use serde_json::Value;
|
|
|
|
use super::{DialogSpec, form};
|
|
use crate::VectorcraftApp;
|
|
use crate::state::Dialog;
|
|
|
|
pub(super) const SPEC: DialogSpec = DialogSpec {
|
|
heading: |d| tl!(&d.str("__label")).to_string(),
|
|
body: |app, ui, d| {
|
|
let lengths = lengths(&d.str("__command"));
|
|
form::param_fields(ui, d, &|k| lengths.contains(&k), app.session.general_unit());
|
|
false
|
|
},
|
|
confirm,
|
|
..DialogSpec::FORM
|
|
};
|
|
|
|
/// The parameters of the commands this dialog edits that are distances.
|
|
fn lengths(command: &str) -> &'static [&'static str] {
|
|
match command {
|
|
"graph.create" => &["width", "height"],
|
|
"shape.flare" => &["diameter", "pathLength"],
|
|
"artboard.rearrange" => &["spacing"],
|
|
"perspective.grid.set" => &["cell", "distance"],
|
|
"object.repeat.options" => &["radius", "hSpacing", "vSpacing"],
|
|
"text.areaOptions" => &["width", "height", "gutter", "inset", "firstBaselineMin"],
|
|
_ => &[],
|
|
}
|
|
}
|
|
|
|
/// Closes before running, so a dialog the command opens stays open.
|
|
fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
|
|
let cmd = d.str("__command");
|
|
let params = form::params(d);
|
|
app.ui.dialog = None;
|
|
// A tool's click-to-size shape (Flare) goes on the active perspective plane while the grid shows.
|
|
let at = |x: &str, y: &str| Some(vectorcraft_geom::Point::new(params.get(x)?.as_f64()?, params.get(y)?.as_f64()?));
|
|
if let Some((c, p)) =
|
|
at("cx", "cy").or_else(|| at("x", "y")).and_then(|pt| vectorcraft_engine::perspective_click(&app.session, &cmd, ¶ms, pt))
|
|
{
|
|
return app.run(&c, p);
|
|
}
|
|
app.run(&cmd, params)
|
|
}
|