forked from 1b-agent/opencadstudio-upstream
- Revert formatting, import/module reordering and unrelated rewrites outside the feature (command.rs, style.rs, paper.rs, view/mod.rs, properties.rs, dialog.rs, ValuePromptCommand); the new SVG icons stay. - Move the palette logic out of dialog.rs into update/graphic_attributes.rs. - Replace 14 loose app fields and ~50 Message variants by GraphicAttributesState (one Menu enum for the open drop-down) and a nested GraphicAttributesMsg / GradientMsg, like BlockPaletteMsg. - Share the selection -> line/fill handles -> unlocked edit path, reuse valid_block_name, the ribbon lineweight handler and fill_handles, and drop the unused GradientColorToggle, color_open and LineLinetypeScaleInput. - Linetype scale accepts any positive value (e.g. ISO pen widths 0.13, 0.18, 0.25, 0.35) instead of rounding to 0.1 with a 0.1 minimum. - Closing open boundaries and creating the fill is one undo step. - The close prompt also answers typed Y/N + Enter, a bare Enter (Yes) and Escape (cancel), not only the option buttons. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VgkJN8DEojuPTumAXLHotu
482 lines
16 KiB
Rust
482 lines
16 KiB
Rust
//! Gradient flyout of the Graphic Attributes palette.
|
|
|
|
use crate::app::Message;
|
|
use crate::scene::model::hatch_model::GradientKind;
|
|
use crate::ui::window::graphic_attributes::GraphicAttributesMsg;
|
|
use acadrust::types::Color as AcadColor;
|
|
use iced::widget::{
|
|
button, checkbox, column, container, image, mouse_area, row, slider, text, text_input, tooltip,
|
|
Space,
|
|
};
|
|
use iced::{Background, Border, Color, Element, Fill, Length, Theme};
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum GradientColorMode {
|
|
One,
|
|
Two,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct GradientEditorState {
|
|
pub handles: Vec<acadrust::Handle>,
|
|
pub color_mode: GradientColorMode,
|
|
pub color_1: AcadColor,
|
|
pub color_2: AcadColor,
|
|
pub shade_tint: f32,
|
|
pub kind: GradientKind,
|
|
pub inverted: bool,
|
|
pub angle: String,
|
|
pub centered: bool,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum GradientMsg {
|
|
Open,
|
|
Cancel,
|
|
Apply,
|
|
ColorMode(GradientColorMode),
|
|
/// Stop colour 1 or 2.
|
|
Color(u8, AcadColor),
|
|
ShadeTint(f32),
|
|
Kind(GradientKind),
|
|
InvertToggled,
|
|
Angle(String),
|
|
AngleReset,
|
|
Centered(bool),
|
|
}
|
|
|
|
fn msg(message: GradientMsg) -> Message {
|
|
Message::GraphicAttributes(GraphicAttributesMsg::Gradient(message))
|
|
}
|
|
|
|
impl GradientEditorState {
|
|
pub fn from_hatch(
|
|
handles: Vec<acadrust::Handle>,
|
|
hatch: &acadrust::entities::Hatch,
|
|
) -> Self {
|
|
let color = |index: usize| {
|
|
hatch
|
|
.gradient_color
|
|
.colors
|
|
.get(index)
|
|
.map(|entry| entry.color)
|
|
.unwrap_or(AcadColor::Index(7))
|
|
};
|
|
let (kind, inverted) = GradientKind::from_name(&hatch.gradient_color.name);
|
|
Self {
|
|
handles,
|
|
color_mode: if hatch.gradient_color.is_single_color {
|
|
GradientColorMode::One
|
|
} else {
|
|
GradientColorMode::Two
|
|
},
|
|
color_1: color(0),
|
|
color_2: color(1),
|
|
shade_tint: hatch.gradient_color.color_tint as f32,
|
|
kind,
|
|
inverted,
|
|
angle: format!("{:.1}°", hatch.gradient_color.angle.to_degrees()),
|
|
centered: hatch.gradient_color.shift.abs() < 1e-9,
|
|
}
|
|
}
|
|
|
|
pub fn update(&mut self, message: GradientMsg) {
|
|
match message {
|
|
GradientMsg::ColorMode(mode) => self.color_mode = mode,
|
|
GradientMsg::Color(1, color) => self.color_1 = color,
|
|
GradientMsg::Color(_, color) => self.color_2 = color,
|
|
GradientMsg::ShadeTint(value) => self.shade_tint = value.clamp(0.0, 1.0),
|
|
GradientMsg::Kind(kind) => {
|
|
self.kind = kind;
|
|
if kind == GradientKind::Linear {
|
|
self.inverted = false;
|
|
}
|
|
}
|
|
GradientMsg::InvertToggled => {
|
|
if self.kind != GradientKind::Linear {
|
|
self.inverted ^= true;
|
|
}
|
|
}
|
|
GradientMsg::Angle(value) => self.angle = value,
|
|
GradientMsg::AngleReset => self.angle = "0.0°".into(),
|
|
GradientMsg::Centered(value) => self.centered = value,
|
|
GradientMsg::Open | GradientMsg::Cancel | GradientMsg::Apply => {}
|
|
}
|
|
}
|
|
|
|
pub fn angle_radians(&self) -> f64 {
|
|
self.angle
|
|
.trim()
|
|
.trim_end_matches('°')
|
|
.replace(',', ".")
|
|
.parse::<f64>()
|
|
.unwrap_or(0.0)
|
|
.rem_euclid(360.0)
|
|
.to_radians()
|
|
}
|
|
}
|
|
|
|
fn rgb(color: &AcadColor) -> Color {
|
|
let (r, g, b) = match color {
|
|
AcadColor::Rgb { r, g, b } => (*r, *g, *b),
|
|
AcadColor::Index(i) => {
|
|
acadrust::types::aci_table::aci_to_rgb(*i).unwrap_or((128, 128, 128))
|
|
}
|
|
_ => (255, 255, 255),
|
|
};
|
|
Color::from_rgb8(r, g, b)
|
|
}
|
|
|
|
fn rgb_array(color: &AcadColor) -> [f32; 4] {
|
|
let c = rgb(color);
|
|
[c.r, c.g, c.b, 1.0]
|
|
}
|
|
|
|
fn mix_rgba(a: Color, b: Color, t: f32) -> [u8; 4] {
|
|
let channel = |a: f32, b: f32| ((a + (b - a) * t) * 255.0).round() as u8;
|
|
[channel(a.r, b.r), channel(a.g, b.g), channel(a.b, b.b), 255]
|
|
}
|
|
|
|
fn preview_sized(
|
|
state: &GradientEditorState,
|
|
width: u32,
|
|
height: u32,
|
|
) -> Option<iced::widget::image::Handle> {
|
|
let c1 = rgb(&state.color_1);
|
|
let c2 = if state.color_mode == GradientColorMode::One {
|
|
let c = crate::scene::gradient_tint_color(rgb_array(&state.color_1), state.shade_tint);
|
|
Color::from_rgb(c[0], c[1], c[2])
|
|
} else {
|
|
rgb(&state.color_2)
|
|
};
|
|
let angle = state.angle_radians();
|
|
let frame = cadkernel::geom2d::gradient_frame(
|
|
&[[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]],
|
|
angle,
|
|
if state.centered { 0.0 } else { 1.0 },
|
|
cadkernel::geom2d::Tolerance::default(),
|
|
)?;
|
|
let (sin, cos) = angle.sin_cos();
|
|
let radial = state.kind.radial();
|
|
let mut pixels = Vec::with_capacity((width * height * 4) as usize);
|
|
for y in 0..height {
|
|
let py = y as f64 / (height - 1) as f64;
|
|
for x in 0..width {
|
|
let px = x as f64 / (width - 1) as f64;
|
|
let mut t = if radial {
|
|
((px - frame.center[0]).hypot(py - frame.center[1]) / frame.radius).clamp(0.0, 1.0)
|
|
as f32
|
|
} else {
|
|
(((px * cos + py * sin) - frame.projection_min) / frame.projection_span)
|
|
.clamp(0.0, 1.0) as f32
|
|
};
|
|
if state.kind == GradientKind::Cylinder {
|
|
t = 1.0 - (2.0 * t - 1.0).abs();
|
|
} else if state.kind == GradientKind::Curved {
|
|
t *= t;
|
|
} else if state.kind == GradientKind::Hemispherical {
|
|
t = t.sqrt();
|
|
}
|
|
if state.inverted {
|
|
t = 1.0 - t;
|
|
}
|
|
pixels.extend_from_slice(&if radial {
|
|
mix_rgba(c2, c1, t)
|
|
} else {
|
|
mix_rgba(c1, c2, t)
|
|
});
|
|
}
|
|
}
|
|
Some(iced::widget::image::Handle::from_rgba(width, height, pixels))
|
|
}
|
|
|
|
fn preview(state: &GradientEditorState) -> Element<'static, Message> {
|
|
preview_image(preview_sized(state, 370, 80))
|
|
}
|
|
|
|
pub(crate) fn compact_preview(hatch: &acadrust::entities::Hatch) -> Element<'static, Message> {
|
|
preview_image(preview_sized(
|
|
&GradientEditorState::from_hatch(Vec::new(), hatch),
|
|
256,
|
|
26,
|
|
))
|
|
}
|
|
|
|
fn preview_image(handle: Option<iced::widget::image::Handle>) -> Element<'static, Message> {
|
|
match handle {
|
|
Some(handle) => image(handle)
|
|
.width(Fill)
|
|
.height(Fill)
|
|
.content_fit(iced::ContentFit::Fill)
|
|
.into(),
|
|
None => Space::new().width(Fill).height(Fill).into(),
|
|
}
|
|
}
|
|
|
|
fn icon(kind: GradientKind, inverted: bool) -> &'static [u8] {
|
|
match (kind, inverted) {
|
|
(GradientKind::Linear, _) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_linear.svg")
|
|
}
|
|
(GradientKind::Cylinder, false) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_cylindrical.svg")
|
|
}
|
|
(GradientKind::Cylinder, true) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_cylindrical_inverted.svg")
|
|
}
|
|
(GradientKind::Spherical, false) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_spherical.svg")
|
|
}
|
|
(GradientKind::Spherical, true) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_spherical_inverted.svg")
|
|
}
|
|
(GradientKind::Hemispherical, false) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_hemispherical.svg")
|
|
}
|
|
(GradientKind::Hemispherical, true) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_hemispherical_inverted.svg")
|
|
}
|
|
(GradientKind::Curved, false) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_curved.svg")
|
|
}
|
|
(GradientKind::Curved, true) => {
|
|
include_bytes!("../../../assets/icons/gradient/gradient_curved_inverted.svg")
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn view(state: &GradientEditorState, dimmed: bool) -> Element<'_, Message> {
|
|
let segment = |label, mode| {
|
|
let selected = state.color_mode == mode;
|
|
button(text(label).size(11))
|
|
.on_press(msg(GradientMsg::ColorMode(mode)))
|
|
.width(Fill)
|
|
.style(move |theme: &Theme, status| {
|
|
if selected {
|
|
button::primary(theme, status)
|
|
} else {
|
|
button::secondary(theme, status)
|
|
}
|
|
})
|
|
};
|
|
let color_field = |label: &'static str, index, color: AcadColor| {
|
|
let (background, _) = crate::ui::properties::acad_color_display(color);
|
|
let value = crate::ui::color_select::color_display_name(color);
|
|
let picker = button(
|
|
row![
|
|
crate::ui::color_select::swatch(background),
|
|
text(value).size(10),
|
|
Space::new().width(Fill),
|
|
]
|
|
.spacing(5)
|
|
.align_y(iced::Center),
|
|
)
|
|
.on_press(Message::OpenColorWindow(
|
|
crate::app::ColorPickTarget::Gradient(index),
|
|
color,
|
|
))
|
|
.style(|theme: &Theme, status| {
|
|
let palette = theme.palette();
|
|
button::Style {
|
|
background: Some(Background::Color(
|
|
if matches!(status, button::Status::Hovered) {
|
|
palette.background.weak.color
|
|
} else {
|
|
palette.background.base.color
|
|
},
|
|
)),
|
|
text_color: palette.background.base.text,
|
|
border: Border {
|
|
color: palette.background.neutral.color,
|
|
width: 1.0,
|
|
radius: 2.0.into(),
|
|
},
|
|
..Default::default()
|
|
}
|
|
})
|
|
.height(crate::ui::ROW_H)
|
|
.padding([3, 6])
|
|
.width(Fill);
|
|
row![text(label).size(11).width(43), picker]
|
|
.spacing(4)
|
|
.align_y(iced::Center)
|
|
.width(Fill)
|
|
};
|
|
let kinds = [
|
|
(GradientKind::Linear, "Linear"),
|
|
(GradientKind::Cylinder, "Cyl."),
|
|
(GradientKind::Spherical, "Spher."),
|
|
(GradientKind::Hemispherical, "Hemi."),
|
|
(GradientKind::Curved, "Curved"),
|
|
];
|
|
let mut type_row = row![].spacing(3);
|
|
for (kind, label) in kinds {
|
|
let selected = state.kind == kind;
|
|
let b = button(
|
|
column![
|
|
crate::ui::icons::semantic(
|
|
icon(kind, state.inverted && kind != GradientKind::Linear),
|
|
25.0
|
|
),
|
|
text(label).size(9)
|
|
]
|
|
.align_x(iced::Center),
|
|
)
|
|
.on_press(msg(GradientMsg::Kind(kind)))
|
|
.width(48)
|
|
.height(48)
|
|
.style(move |theme: &Theme, status| {
|
|
let mut s = button::subtle(theme, status);
|
|
if selected {
|
|
s.border.color = theme.palette().primary.base.color;
|
|
s.border.width = 1.0;
|
|
}
|
|
s
|
|
});
|
|
type_row = type_row.push(tooltip(
|
|
b,
|
|
text(kind.choice_label(false)).size(10),
|
|
tooltip::Position::Bottom,
|
|
));
|
|
}
|
|
let invert_selected = state.inverted && state.kind != GradientKind::Linear;
|
|
let invert = button(column![text("⇄").size(18), text("Invert").size(9)].align_x(iced::Center))
|
|
.on_press_maybe(
|
|
(state.kind != GradientKind::Linear).then(|| msg(GradientMsg::InvertToggled)),
|
|
)
|
|
.width(42)
|
|
.height(48)
|
|
.style(move |theme: &Theme, status| {
|
|
let mut style = button::secondary(theme, status);
|
|
if invert_selected {
|
|
style.border.color = theme.palette().primary.base.color;
|
|
style.border.width = 1.0;
|
|
}
|
|
style
|
|
});
|
|
let separator =
|
|
container(Space::new().width(1).height(36)).style(|theme: &Theme| container::Style {
|
|
background: Some(Background::Color(theme.palette().background.neutral.color)),
|
|
..Default::default()
|
|
});
|
|
type_row = type_row.push(separator).push(tooltip(
|
|
invert,
|
|
text("Invert gradient").size(10),
|
|
tooltip::Position::Bottom,
|
|
));
|
|
let colors: Element<'_, Message> = if state.color_mode == GradientColorMode::Two {
|
|
row![
|
|
color_field("Color 1", 1, state.color_1),
|
|
color_field("Color 2", 2, state.color_2)
|
|
]
|
|
.spacing(6)
|
|
.into()
|
|
} else {
|
|
row![
|
|
color_field("Color 1", 1, state.color_1),
|
|
row![
|
|
text("Tone").size(11).width(43),
|
|
slider(0..=100, (state.shade_tint * 100.0) as i32, |v| {
|
|
msg(GradientMsg::ShadeTint(v as f32 / 100.0))
|
|
})
|
|
.width(Fill)
|
|
]
|
|
.spacing(4)
|
|
.align_y(iced::Center)
|
|
.height(crate::ui::ROW_H)
|
|
.width(Fill)
|
|
]
|
|
.spacing(6)
|
|
.align_y(iced::Center)
|
|
.into()
|
|
};
|
|
let angle = row![
|
|
text("Angle").size(11).width(43),
|
|
text_input("0.0°", &state.angle)
|
|
.on_input(|value| msg(GradientMsg::Angle(value)))
|
|
.size(11)
|
|
.width(Length::Fixed(92.0)),
|
|
tooltip(
|
|
button(crate::ui::icons::themed_undo(11.0, true))
|
|
.on_press(msg(GradientMsg::AngleReset))
|
|
.style(button::subtle)
|
|
.padding(3)
|
|
.width(24)
|
|
.height(crate::ui::ROW_H),
|
|
text("Reset angle").size(10),
|
|
tooltip::Position::Bottom,
|
|
),
|
|
Space::new().width(Fill),
|
|
checkbox(state.centered)
|
|
.label("Centered")
|
|
.on_toggle(|value| msg(GradientMsg::Centered(value)))
|
|
.size(14)
|
|
.text_size(11)
|
|
]
|
|
.spacing(6)
|
|
.align_y(iced::Center);
|
|
let types = row![text("Type").size(11).width(43), type_row]
|
|
.spacing(4)
|
|
.align_y(iced::Center);
|
|
let actions = container(
|
|
row![
|
|
button(text(crate::t!("Cancel")).size(11))
|
|
.on_press(msg(GradientMsg::Cancel))
|
|
.style(button::secondary)
|
|
.padding([5, 14]),
|
|
button(text(crate::t!("OK")).size(11))
|
|
.on_press(msg(GradientMsg::Apply))
|
|
.style(button::primary)
|
|
.padding([5, 18]),
|
|
]
|
|
.spacing(8),
|
|
)
|
|
.width(Fill)
|
|
.align_x(iced::alignment::Horizontal::Right);
|
|
let content = column![
|
|
container(preview(state)).width(Fill).height(80),
|
|
row![
|
|
segment("One Color", GradientColorMode::One),
|
|
segment("Two Colors", GradientColorMode::Two)
|
|
]
|
|
.spacing(2),
|
|
colors,
|
|
types,
|
|
angle,
|
|
actions
|
|
]
|
|
.spacing(8)
|
|
.padding(10);
|
|
let panel: Element<'_, Message> = container(content)
|
|
.width(Length::Fixed(390.0))
|
|
.style(|theme: &Theme| container::Style {
|
|
background: Some(Background::Color(theme.palette().background.base.color)),
|
|
border: Border {
|
|
color: theme.palette().primary.base.color,
|
|
width: 1.0,
|
|
radius: 3.0.into(),
|
|
},
|
|
..Default::default()
|
|
})
|
|
.into();
|
|
let panel: Element<'_, Message> = if dimmed {
|
|
let shield = container(Space::new())
|
|
.width(Fill)
|
|
.height(Fill)
|
|
.style(|theme: &Theme| container::Style {
|
|
background: Some(Background::Color(
|
|
theme.palette().background.strongest.color.scale_alpha(0.55),
|
|
)),
|
|
..Default::default()
|
|
});
|
|
iced::widget::stack![panel, iced::widget::opaque(shield)]
|
|
.width(Length::Fixed(390.0))
|
|
.into()
|
|
} else {
|
|
panel
|
|
};
|
|
mouse_area(panel)
|
|
.interaction(iced::mouse::Interaction::Pointer)
|
|
.into()
|
|
}
|