forked from 1b-agent/opencadstudio-upstream
feat(attedit): enhanced attribute editor with 3 tabs
Grow the attribute editor into a three-tab enhanced editor: - Attribute: the tag/prompt/value list; click a row to select it, edit its value below. - Text Options: the selected attribute's Text Style, Justification, Height, Rotation, Width Factor, Oblique Angle, Backwards, Upside down. - Properties: the selected attribute's Layer, Linetype, Color, Lineweight (the colour list also surfaces a non-standard current colour so it displays and round-trips). Applying writes value, text-formatting and common-property edits back to each attribute positionally (guarded on block name + count), with undo and a repaint. OK/Cancel are replaced by a single Apply button in a top toolbar that commits but keeps the dialog open, matching the other modal windows — the frame ✕ closes and discards un-applied edits. The frame adopts the shared style-window palette, tab styling and sizing. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Opus 4.8 committed
1 parent
0eb347bf47
commit
0b60bcc075
6 files changed
+722
-170
No files matched your search
+427
-110
@@ -1,22 +1,149 @@
|
||||
//! Attribute editor dialog — edit the attribute values of a single block
|
||||
//! Enhanced attribute editor dialog — edit the attributes of one block
|
||||
//! reference (INSERT). Opened by double-clicking a block that carries
|
||||
//! attributes, or by the ATTEDIT command with such a block selected.
|
||||
//! attributes, or by ATTEDIT with such a block selected.
|
||||
//!
|
||||
//! Each attribute is one row: its prompt/tag (read-only) and an editable value
|
||||
//! box. OK writes every value back to the block; Cancel (the ✕ or button)
|
||||
//! discards. The heavy lifting — applying edits, undo, repaint — lives in the
|
||||
//! update handler (`Message::AttrEditorOk`); this module is pure layout.
|
||||
//! Three tabs, mirroring the standard enhanced attribute editor:
|
||||
//! * **Attribute** — the tag / prompt / value list; the selected row's value
|
||||
//! is edited below the list.
|
||||
//! * **Text Options** — the selected attribute's text formatting (style,
|
||||
//! justification, height, rotation, width, oblique, flags).
|
||||
//! * **Properties** — the selected attribute's common entity properties
|
||||
//! (layer, linetype, colour, lineweight).
|
||||
//!
|
||||
//! This module is pure layout over a working copy ([`AttrRow`]); applying the
|
||||
//! edits, undo and repaint live in the update handler (`Message::AttrEditorApply`).
|
||||
|
||||
use crate::app::Message;
|
||||
use iced::widget::{button, column, container, row, scrollable, text, text_input, Space};
|
||||
use acadrust::entities::{HorizontalAlignment, VerticalAlignment};
|
||||
use acadrust::types::{Color as AcadColor, LineWeight};
|
||||
use iced::widget::{
|
||||
button, checkbox, column, container, pick_list, row, scrollable, text, text_input, Space,
|
||||
};
|
||||
use iced::{Background, Border, Color, Element, Length, Theme};
|
||||
|
||||
use crate::ui::properties::{lw_options, LwItem};
|
||||
|
||||
// Palette shared with the style-manager windows so the editor reads as one of
|
||||
// them: toolbar (TB) on top, BG panels, ACTIVE for the selected tab / row.
|
||||
const TB: Color = Color { r: 0.13, g: 0.13, b: 0.13, a: 1.0 };
|
||||
const BG: Color = Color { r: 0.15, g: 0.15, b: 0.15, a: 1.0 };
|
||||
const WHITE: Color = Color { r: 0.92, g: 0.92, b: 0.92, a: 1.0 };
|
||||
const WHITE: Color = Color { r: 0.88, g: 0.88, b: 0.88, a: 1.0 };
|
||||
const DIM: Color = Color { r: 0.55, g: 0.55, b: 0.55, a: 1.0 };
|
||||
const ACCENT: Color = Color { r: 0.30, g: 0.62, b: 0.95, a: 1.0 };
|
||||
const ACCENT: Color = Color { r: 0.25, g: 0.50, b: 0.85, a: 1.0 };
|
||||
const FIELD_BG: Color = Color { r: 0.10, g: 0.10, b: 0.10, a: 1.0 };
|
||||
const BORDER: Color = Color { r: 0.32, g: 0.32, b: 0.32, a: 1.0 };
|
||||
const BORDER: Color = Color { r: 0.35, g: 0.35, b: 0.35, a: 1.0 };
|
||||
const ACTIVE: Color = Color { r: 0.20, g: 0.40, b: 0.70, a: 1.0 };
|
||||
const ROW_SEL: Color = ACTIVE;
|
||||
const ROW_BG: Color = Color { r: 0.12, g: 0.12, b: 0.12, a: 1.0 };
|
||||
|
||||
const LABEL_W: f32 = 120.0;
|
||||
|
||||
/// Which tab of the editor is showing.
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
||||
pub enum AttrTab {
|
||||
Attribute,
|
||||
TextOptions,
|
||||
Properties,
|
||||
}
|
||||
|
||||
/// Editable working copy of one attribute. Numeric fields are kept as strings
|
||||
/// so the user can type freely; they are parsed when Apply is pressed. Angles
|
||||
/// are shown and entered in degrees.
|
||||
#[derive(Clone)]
|
||||
pub struct AttrRow {
|
||||
pub tag: String,
|
||||
pub prompt: String,
|
||||
pub value: String,
|
||||
// Text options
|
||||
pub text_style: String,
|
||||
pub height: String,
|
||||
pub rotation: String,
|
||||
pub width_factor: String,
|
||||
pub oblique: String,
|
||||
pub h_align: HorizontalAlignment,
|
||||
pub v_align: VerticalAlignment,
|
||||
pub backwards: bool,
|
||||
pub upside_down: bool,
|
||||
// Properties (common entity)
|
||||
pub layer: String,
|
||||
pub color: AcadColor,
|
||||
pub linetype: String,
|
||||
pub line_weight: LineWeight,
|
||||
}
|
||||
|
||||
/// Combined justification options (horizontal × vertical), matching the
|
||||
/// standard text-justification list.
|
||||
pub const JUSTIFY: &[(&str, HorizontalAlignment, VerticalAlignment)] = &[
|
||||
("Left", HorizontalAlignment::Left, VerticalAlignment::Baseline),
|
||||
("Center", HorizontalAlignment::Center, VerticalAlignment::Baseline),
|
||||
("Right", HorizontalAlignment::Right, VerticalAlignment::Baseline),
|
||||
("Aligned", HorizontalAlignment::Aligned, VerticalAlignment::Baseline),
|
||||
("Middle", HorizontalAlignment::Middle, VerticalAlignment::Baseline),
|
||||
("Fit", HorizontalAlignment::Fit, VerticalAlignment::Baseline),
|
||||
("Top Left", HorizontalAlignment::Left, VerticalAlignment::Top),
|
||||
("Top Center", HorizontalAlignment::Center, VerticalAlignment::Top),
|
||||
("Top Right", HorizontalAlignment::Right, VerticalAlignment::Top),
|
||||
("Middle Left", HorizontalAlignment::Left, VerticalAlignment::Middle),
|
||||
("Middle Center", HorizontalAlignment::Center, VerticalAlignment::Middle),
|
||||
("Middle Right", HorizontalAlignment::Right, VerticalAlignment::Middle),
|
||||
("Bottom Left", HorizontalAlignment::Left, VerticalAlignment::Bottom),
|
||||
("Bottom Center", HorizontalAlignment::Center, VerticalAlignment::Bottom),
|
||||
("Bottom Right", HorizontalAlignment::Right, VerticalAlignment::Bottom),
|
||||
];
|
||||
|
||||
/// The justification label for an (h, v) pair (defaults to "Left").
|
||||
pub fn justify_label(h: HorizontalAlignment, v: VerticalAlignment) -> &'static str {
|
||||
JUSTIFY
|
||||
.iter()
|
||||
.find(|(_, jh, jv)| *jh == h && *jv == v)
|
||||
.map(|(l, _, _)| *l)
|
||||
.unwrap_or("Left")
|
||||
}
|
||||
|
||||
/// Resolve a justification label back to its (h, v) pair.
|
||||
pub fn justify_from_label(label: &str) -> Option<(HorizontalAlignment, VerticalAlignment)> {
|
||||
JUSTIFY
|
||||
.iter()
|
||||
.find(|(l, _, _)| *l == label)
|
||||
.map(|(_, h, v)| (*h, *v))
|
||||
}
|
||||
|
||||
const COLOR_OPTIONS: &[&str] = &[
|
||||
"ByLayer", "ByBlock", "Red", "Yellow", "Green", "Cyan", "Blue", "Magenta", "White",
|
||||
];
|
||||
|
||||
/// Display label for a colour (falls back to `Color <n>` for non-standard ACI).
|
||||
pub fn color_label(c: AcadColor) -> String {
|
||||
match c {
|
||||
AcadColor::ByLayer => "ByLayer".into(),
|
||||
AcadColor::ByBlock => "ByBlock".into(),
|
||||
AcadColor::Index(1) => "Red".into(),
|
||||
AcadColor::Index(2) => "Yellow".into(),
|
||||
AcadColor::Index(3) => "Green".into(),
|
||||
AcadColor::Index(4) => "Cyan".into(),
|
||||
AcadColor::Index(5) => "Blue".into(),
|
||||
AcadColor::Index(6) => "Magenta".into(),
|
||||
AcadColor::Index(7) => "White".into(),
|
||||
AcadColor::Index(n) => format!("Color {n}"),
|
||||
AcadColor::Rgb { r, g, b } => format!("{r},{g},{b}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolve a colour label back to an `AcadColor` (None if unknown).
|
||||
pub fn color_from_label(label: &str) -> Option<AcadColor> {
|
||||
Some(match label {
|
||||
"ByLayer" => AcadColor::ByLayer,
|
||||
"ByBlock" => AcadColor::ByBlock,
|
||||
"Red" => AcadColor::Index(1),
|
||||
"Yellow" => AcadColor::Index(2),
|
||||
"Green" => AcadColor::Index(3),
|
||||
"Cyan" => AcadColor::Index(4),
|
||||
"Blue" => AcadColor::Index(5),
|
||||
"Magenta" => AcadColor::Index(6),
|
||||
"White" => AcadColor::Index(7),
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
fn field_style(_t: &Theme, _s: text_input::Status) -> text_input::Style {
|
||||
text_input::Style {
|
||||
@@ -29,114 +156,304 @@ fn field_style(_t: &Theme, _s: text_input::Status) -> text_input::Style {
|
||||
}
|
||||
}
|
||||
|
||||
/// Build the attribute editor dialog body. `block` is the reference's block
|
||||
/// name (shown as a subtitle); `fields` are the `(tag, prompt, value)` triples
|
||||
/// in attribute order — the row index is the routing key back to
|
||||
/// `Message::AttrEditorInput`. Each row is labelled with the prompt (falling
|
||||
/// back to the tag when the block defines none), so the label reads as it would
|
||||
/// when inserting the block.
|
||||
fn accent_btn(_t: &Theme, status: button::Status) -> button::Style {
|
||||
let bg = if matches!(status, button::Status::Hovered | button::Status::Pressed) {
|
||||
Color { r: 0.20, g: 0.42, b: 0.72, a: 1.0 }
|
||||
} else {
|
||||
ACCENT
|
||||
};
|
||||
button::Style {
|
||||
background: Some(Background::Color(bg)),
|
||||
text_color: WHITE,
|
||||
border: Border { color: BORDER, width: 1.0, radius: 4.0.into() },
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
/// Horizontal 1px divider in the shared border colour (matches style windows).
|
||||
fn hdivider<'a>() -> Element<'a, Message> {
|
||||
container(Space::new().width(Length::Fill).height(1))
|
||||
.width(Length::Fill)
|
||||
.height(1)
|
||||
.style(|_: &Theme| container::Style {
|
||||
background: Some(Background::Color(BORDER)),
|
||||
..Default::default()
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
||||
/// One `label : widget` row with a fixed-width label column.
|
||||
fn field_row<'a>(label: &'a str, widget: Element<'a, Message>) -> Element<'a, Message> {
|
||||
row![
|
||||
container(text(label).size(12).color(DIM)).width(LABEL_W),
|
||||
widget,
|
||||
]
|
||||
.spacing(8)
|
||||
.align_y(iced::Center)
|
||||
.into()
|
||||
}
|
||||
|
||||
/// A labelled editable text field for one of the selected row's string buffers.
|
||||
fn edit_field<'a>(
|
||||
label: &'a str,
|
||||
value: &'a str,
|
||||
on_input: impl Fn(String) -> Message + 'a,
|
||||
) -> Element<'a, Message> {
|
||||
let ti = text_input("", value)
|
||||
.on_input(on_input)
|
||||
.on_submit(Message::AttrEditorApply)
|
||||
.style(field_style)
|
||||
.size(13)
|
||||
.padding([3, 6])
|
||||
.width(Length::Fill);
|
||||
field_row(label, ti.into())
|
||||
}
|
||||
|
||||
/// A labelled pick_list of owned string options.
|
||||
fn pick_field<'a>(
|
||||
label: &'a str,
|
||||
options: Vec<String>,
|
||||
selected: Option<String>,
|
||||
on_select: impl Fn(String) -> Message + 'a,
|
||||
) -> Element<'a, Message> {
|
||||
let pl = pick_list(options, selected, on_select)
|
||||
.text_size(13)
|
||||
.padding([3, 6])
|
||||
.width(Length::Fill);
|
||||
field_row(label, pl.into())
|
||||
}
|
||||
|
||||
fn tab_button<'a>(label: &'a str, this: AttrTab, active: AttrTab) -> Element<'a, Message> {
|
||||
let is_active = this == active;
|
||||
button(text(label).size(11).color(WHITE))
|
||||
.padding([4, 12])
|
||||
.on_press(Message::AttrEditorTab(this))
|
||||
.style(move |_t: &Theme, status| button::Style {
|
||||
background: Some(Background::Color(match (is_active, status) {
|
||||
(true, _) => ACTIVE,
|
||||
(false, button::Status::Hovered | button::Status::Pressed) => {
|
||||
Color { r: 0.28, g: 0.28, b: 0.28, a: 1.0 }
|
||||
}
|
||||
_ => Color { r: 0.20, g: 0.20, b: 0.20, a: 1.0 },
|
||||
})),
|
||||
text_color: WHITE,
|
||||
border: Border { color: BORDER, width: 1.0, radius: 3.0.into() },
|
||||
..Default::default()
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
||||
/// Build the enhanced attribute editor. `rows` is the working copy (attribute
|
||||
/// order); `selected` is the highlighted row driving the Text Options /
|
||||
/// Properties tabs. `layers` / `linetypes` / `styles` are the document's pick
|
||||
/// lists.
|
||||
pub fn view_window<'a>(
|
||||
block: &'a str,
|
||||
fields: &'a [(String, String, String)],
|
||||
rows: &'a [AttrRow],
|
||||
selected: usize,
|
||||
tab: AttrTab,
|
||||
layers: Vec<String>,
|
||||
linetypes: Vec<String>,
|
||||
styles: Vec<String>,
|
||||
) -> Element<'a, Message> {
|
||||
let mut list = column![].spacing(6);
|
||||
for (idx, (tag, prompt, value)) in fields.iter().enumerate() {
|
||||
let label = if prompt.trim().is_empty() {
|
||||
tag.as_str()
|
||||
} else {
|
||||
prompt.as_str()
|
||||
};
|
||||
|
||||
let value_box = text_input("", value)
|
||||
.on_input(move |v| Message::AttrEditorInput { idx, value: v })
|
||||
.on_submit(Message::AttrEditorOk)
|
||||
.style(field_style)
|
||||
.size(13)
|
||||
.padding([4, 6])
|
||||
.width(Length::Fill);
|
||||
|
||||
let attr_row = row![
|
||||
container(text(label).size(13).color(WHITE))
|
||||
.width(170)
|
||||
.padding([4, 6]),
|
||||
value_box,
|
||||
// ── Top toolbar: block name on the left, Apply on the right ───────────
|
||||
// Mirrors the style-manager windows (actions left, primary action right).
|
||||
let apply = button(text("Apply").size(11).color(WHITE))
|
||||
.padding([4, 14])
|
||||
.on_press(Message::AttrEditorApply)
|
||||
.style(accent_btn);
|
||||
let toolbar = container(
|
||||
row![
|
||||
text(format!("Block: {block}")).size(12).color(DIM),
|
||||
Space::new().width(Length::Fill),
|
||||
apply,
|
||||
]
|
||||
.spacing(8)
|
||||
.align_y(iced::Center);
|
||||
list = list.push(attr_row);
|
||||
}
|
||||
|
||||
let body: Element<'_, Message> = if fields.is_empty() {
|
||||
text("This block has no attributes.")
|
||||
.size(13)
|
||||
.color(DIM)
|
||||
.into()
|
||||
} else {
|
||||
scrollable(list).height(Length::Fill).into()
|
||||
};
|
||||
|
||||
let ok = button(text("OK").size(13).color(WHITE))
|
||||
.padding([5, 22])
|
||||
.on_press(Message::AttrEditorOk)
|
||||
.style(|_: &Theme, status| {
|
||||
let bg = if matches!(status, button::Status::Hovered | button::Status::Pressed) {
|
||||
Color { r: 0.32, g: 0.55, b: 0.85, a: 1.0 }
|
||||
} else {
|
||||
ACCENT
|
||||
};
|
||||
button::Style {
|
||||
background: Some(Background::Color(bg)),
|
||||
text_color: WHITE,
|
||||
border: Border { radius: 4.0.into(), ..Default::default() },
|
||||
..Default::default()
|
||||
}
|
||||
});
|
||||
|
||||
let cancel = button(text("Cancel").size(13).color(WHITE))
|
||||
.padding([5, 18])
|
||||
.on_press(Message::CloseModal)
|
||||
.style(|_: &Theme, status| {
|
||||
let bg = if matches!(status, button::Status::Hovered | button::Status::Pressed) {
|
||||
Color { r: 0.28, g: 0.28, b: 0.28, a: 1.0 }
|
||||
} else {
|
||||
Color { r: 0.20, g: 0.20, b: 0.20, a: 1.0 }
|
||||
};
|
||||
button::Style {
|
||||
background: Some(Background::Color(bg)),
|
||||
text_color: WHITE,
|
||||
border: Border { color: BORDER, width: 1.0, radius: 4.0.into() },
|
||||
..Default::default()
|
||||
}
|
||||
});
|
||||
|
||||
let header = column![
|
||||
text("Edit Attributes").size(18).color(WHITE),
|
||||
text(format!("Block: {block}")).size(12).color(DIM),
|
||||
]
|
||||
.spacing(2);
|
||||
|
||||
container(
|
||||
column![
|
||||
header,
|
||||
Space::new().height(10),
|
||||
body,
|
||||
Space::new().height(12),
|
||||
row![
|
||||
Space::new().width(Length::Fill),
|
||||
cancel,
|
||||
Space::new().width(8),
|
||||
ok
|
||||
]
|
||||
.align_y(iced::Center),
|
||||
]
|
||||
.padding(4),
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.style(|_: &Theme| container::Style {
|
||||
background: Some(Background::Color(BG)),
|
||||
background: Some(Background::Color(TB)),
|
||||
..Default::default()
|
||||
})
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.padding(14)
|
||||
.padding([5, 8]);
|
||||
|
||||
let tabs = row![
|
||||
tab_button("Attribute", AttrTab::Attribute, tab),
|
||||
tab_button("Text Options", AttrTab::TextOptions, tab),
|
||||
tab_button("Properties", AttrTab::Properties, tab),
|
||||
]
|
||||
.spacing(2);
|
||||
|
||||
let body: Element<'_, Message> = if rows.is_empty() {
|
||||
text("This block has no attributes.").size(13).color(DIM).into()
|
||||
} else {
|
||||
match tab {
|
||||
AttrTab::Attribute => attribute_tab(rows, selected),
|
||||
AttrTab::TextOptions => text_options_tab(&rows[selected.min(rows.len() - 1)], styles),
|
||||
AttrTab::Properties => {
|
||||
properties_tab(&rows[selected.min(rows.len() - 1)], layers, linetypes)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let content = container(column![tabs, body].spacing(8))
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.padding(12);
|
||||
|
||||
container(column![toolbar, hdivider(), content])
|
||||
.style(|_: &Theme| container::Style {
|
||||
background: Some(Background::Color(BG)),
|
||||
..Default::default()
|
||||
})
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
/// Attribute tab: tag / prompt / value list with row-select, plus a value box.
|
||||
fn attribute_tab<'a>(rows: &'a [AttrRow], selected: usize) -> Element<'a, Message> {
|
||||
let head = row![
|
||||
container(text("Tag").size(11).color(DIM)).width(130),
|
||||
container(text("Prompt").size(11).color(DIM)).width(Length::Fill),
|
||||
container(text("Value").size(11).color(DIM)).width(140),
|
||||
]
|
||||
.spacing(6);
|
||||
|
||||
let mut list = column![].spacing(1);
|
||||
for (idx, r) in rows.iter().enumerate() {
|
||||
let is_sel = idx == selected;
|
||||
let line = row![
|
||||
container(text(r.tag.as_str()).size(12).color(WHITE)).width(130),
|
||||
container(text(r.prompt.as_str()).size(12).color(DIM)).width(Length::Fill),
|
||||
container(text(r.value.as_str()).size(12).color(WHITE)).width(140),
|
||||
]
|
||||
.spacing(6);
|
||||
let btn = button(line)
|
||||
.on_press(Message::AttrEditorSelect(idx))
|
||||
.padding([3, 4])
|
||||
.width(Length::Fill)
|
||||
.style(move |_t: &Theme, status| {
|
||||
let hovered = matches!(status, button::Status::Hovered);
|
||||
let bg = if is_sel {
|
||||
ROW_SEL
|
||||
} else if hovered {
|
||||
Color { r: 0.18, g: 0.18, b: 0.18, a: 1.0 }
|
||||
} else {
|
||||
ROW_BG
|
||||
};
|
||||
button::Style {
|
||||
background: Some(Background::Color(bg)),
|
||||
text_color: WHITE,
|
||||
border: Border::default(),
|
||||
..Default::default()
|
||||
}
|
||||
});
|
||||
list = list.push(btn);
|
||||
}
|
||||
|
||||
let sel = selected.min(rows.len() - 1);
|
||||
let value_box = text_input("", rows[sel].value.as_str())
|
||||
.on_input(move |v| Message::AttrEditorInput { idx: sel, value: v })
|
||||
.on_submit(Message::AttrEditorApply)
|
||||
.style(field_style)
|
||||
.size(13)
|
||||
.padding([4, 6])
|
||||
.width(Length::Fill);
|
||||
|
||||
column![
|
||||
head,
|
||||
scrollable(list).height(Length::Fill),
|
||||
Space::new().height(8),
|
||||
field_row("Value:", value_box.into()),
|
||||
]
|
||||
.spacing(6)
|
||||
.into()
|
||||
}
|
||||
|
||||
/// Text Options tab: the selected attribute's text formatting.
|
||||
fn text_options_tab<'a>(r: &'a AttrRow, styles: Vec<String>) -> Element<'a, Message> {
|
||||
let style_sel = if r.text_style.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(r.text_style.clone())
|
||||
};
|
||||
let justify_opts: Vec<String> = JUSTIFY.iter().map(|(l, _, _)| l.to_string()).collect();
|
||||
let justify_sel = Some(justify_label(r.h_align, r.v_align).to_string());
|
||||
|
||||
column![
|
||||
pick_field("Text Style", styles, style_sel, |s| {
|
||||
Message::AttrEditorTextStyle(s)
|
||||
}),
|
||||
pick_field("Justification", justify_opts, justify_sel, |s| {
|
||||
Message::AttrEditorJustify(s)
|
||||
}),
|
||||
edit_field("Height", &r.height, Message::AttrEditorHeight),
|
||||
edit_field("Rotation", &r.rotation, Message::AttrEditorRotation),
|
||||
edit_field("Width Factor", &r.width_factor, Message::AttrEditorWidth),
|
||||
edit_field("Oblique Angle", &r.oblique, Message::AttrEditorOblique),
|
||||
field_row(
|
||||
"",
|
||||
checkbox(r.backwards)
|
||||
.label("Backwards")
|
||||
.on_toggle(Message::AttrEditorBackwards)
|
||||
.size(15)
|
||||
.text_size(12)
|
||||
.into(),
|
||||
),
|
||||
field_row(
|
||||
"",
|
||||
checkbox(r.upside_down)
|
||||
.label("Upside down")
|
||||
.on_toggle(Message::AttrEditorUpsideDown)
|
||||
.size(15)
|
||||
.text_size(12)
|
||||
.into(),
|
||||
),
|
||||
]
|
||||
.spacing(8)
|
||||
.into()
|
||||
}
|
||||
|
||||
/// Properties tab: the selected attribute's common entity properties.
|
||||
fn properties_tab<'a>(
|
||||
r: &'a AttrRow,
|
||||
layers: Vec<String>,
|
||||
linetypes: Vec<String>,
|
||||
) -> Element<'a, Message> {
|
||||
let layer_sel = Some(r.layer.clone());
|
||||
let lt_sel = Some(if r.linetype.is_empty() {
|
||||
"ByLayer".to_string()
|
||||
} else {
|
||||
r.linetype.clone()
|
||||
});
|
||||
let mut color_opts: Vec<String> = COLOR_OPTIONS.iter().map(|s| s.to_string()).collect();
|
||||
// The attribute may carry a colour outside the standard set (ACI 8-255 or
|
||||
// RGB). Surface its label so it displays correctly and stays selectable,
|
||||
// rather than showing blank; picking a listed colour still overrides it.
|
||||
let cur_color = color_label(r.color);
|
||||
if !color_opts.iter().any(|o| o == &cur_color) {
|
||||
color_opts.insert(0, cur_color.clone());
|
||||
}
|
||||
let color_sel = Some(cur_color);
|
||||
|
||||
let lw_opts = lw_options();
|
||||
let lw_sel = LwItem(r.line_weight);
|
||||
let lw = pick_list(lw_opts, Some(lw_sel), |it: LwItem| {
|
||||
Message::AttrEditorLineweight(it.0)
|
||||
})
|
||||
.text_size(13)
|
||||
.padding([3, 6])
|
||||
.width(Length::Fill);
|
||||
|
||||
column![
|
||||
pick_field("Layer", layers, layer_sel, Message::AttrEditorLayer),
|
||||
pick_field("Linetype", linetypes, lt_sel, Message::AttrEditorLinetype),
|
||||
pick_field("Color", color_opts, color_sel, |s| {
|
||||
Message::AttrEditorColor(s)
|
||||
}),
|
||||
field_row("Lineweight", lw.into()),
|
||||
]
|
||||
.spacing(8)
|
||||
.into()
|
||||
}
|
||||
Reference in new issue
Block a user