Split large files: ribbon widgets and scene render/selection
- ribbon.rs → ribbon/mod.rs + ribbon/widgets.rs Extracted all rendering helpers, button styles, colour constants, layout constants and dropdown position calculators into widgets.rs. - scene/mod.rs → scene/mod.rs + scene/selection.rs + scene/render.rs Moved SelectionState into selection.rs; moved CameraState, Primitive, shader::Program/Primitive impls, render_style and resolve_pattern into render.rs, reducing mod.rs from 1323 to ~1030 lines. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven
parent
ed9cbc2092
commit
bdde862597
6 changed files with 1916 additions and 2053 deletions
811
src/ui/ribbon/widgets.rs
Normal file
811
src/ui/ribbon/widgets.rs
Normal file
|
|
@ -0,0 +1,811 @@
|
|||
// Shared rendering helpers, button styles, colours, layout constants, and
|
||||
// free functions used by the Ribbon view/overlay methods.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::time::Duration;
|
||||
|
||||
use acadrust::types::{Color as AcadColor, LineWeight};
|
||||
use iced::widget::tooltip::Position as TipPos;
|
||||
use iced::widget::{button, column, container, row, svg, text, tooltip};
|
||||
use iced::{Background, Border, Color, Element, Fill, Length, Padding, Theme};
|
||||
|
||||
use crate::app::Message;
|
||||
use crate::modules::{IconKind, ModuleEvent, RibbonGroup, RibbonItem, ToolDef};
|
||||
use crate::ui::properties::{LwItem, acad_color_display};
|
||||
|
||||
use super::LayerInfo;
|
||||
|
||||
// ── Layout constants (single source of truth: ROW_H from ui::mod) ─────────
|
||||
|
||||
use crate::ui::ROW_H;
|
||||
|
||||
/// Icon size inside a 3-row (large) button.
|
||||
pub(super) const LARGE_ICON: f32 = ROW_H * 1.5;
|
||||
/// Icon size inside a 1-row (small) button.
|
||||
pub(super) const SMALL_ICON: f32 = ROW_H * 0.7;
|
||||
/// Width of a 3-row (large) button.
|
||||
pub(super) const LARGE_W: f32 = ROW_H * 2.2;
|
||||
/// Width of a 1-row (small) button.
|
||||
pub(super) const SMALL_W: f32 = ROW_H;
|
||||
/// Width of the ▾ strip on a small dropdown.
|
||||
pub(super) const ARROW_W: f32 = ROW_H * 0.4;
|
||||
/// Height of the ▾ strip at the bottom of a large dropdown.
|
||||
pub(super) const LARGE_ARR: f32 = ROW_H * 0.55;
|
||||
/// Total ribbon tool-area height = 3 × ROW_H + 6 px v-padding + 12 px group-label.
|
||||
pub(super) const TOOL_BAR_H: f32 = 3.0 * ROW_H + 18.0;
|
||||
|
||||
// ── Tab-bar constants ──────────────────────────────────────────────────────
|
||||
|
||||
pub(super) const TOP_ARR_W: f32 = 12.0;
|
||||
pub(super) const TOP_HIST_W: f32 = 28.0;
|
||||
pub(super) const TOP_HIST_GAP: f32 = 4.0;
|
||||
|
||||
// ── Dropdown / combo ID constants ─────────────────────────────────────────
|
||||
|
||||
pub(super) const UNDO_HISTORY_ID: &str = "UNDO_HISTORY";
|
||||
pub(super) const REDO_HISTORY_ID: &str = "REDO_HISTORY";
|
||||
pub(super) const LAYER_COMBO_ID: &str = "LAYER_COMBO";
|
||||
pub(super) const PROP_COLOR_ID: &str = "PROP_COLOR";
|
||||
pub(super) const PROP_LINETYPE_ID: &str = "PROP_LINETYPE";
|
||||
pub(super) const PROP_LW_ID: &str = "PROP_LW";
|
||||
|
||||
// ── Colours ────────────────────────────────────────────────────────────────
|
||||
|
||||
pub(super) const LOGO_RED: Color = Color { r: 0.75, g: 0.10, b: 0.10, a: 1.0 };
|
||||
pub(super) const TOPBAR_BG: Color = Color { r: 0.17, g: 0.17, b: 0.17, a: 1.0 };
|
||||
pub(super) const RIBBON_BG: Color = Color { r: 0.22, g: 0.22, b: 0.22, a: 1.0 };
|
||||
pub(super) const BORDER_DARK: Color = Color { r: 0.12, g: 0.12, b: 0.12, a: 1.0 };
|
||||
pub(super) const ACCENT_BLUE: Color = Color { r: 0.20, g: 0.55, b: 0.90, a: 1.0 };
|
||||
pub(super) const ACCENT_GOLD: Color = Color { r: 0.90, g: 0.65, b: 0.10, a: 1.0 };
|
||||
pub(super) const LABEL_COLOR: Color = Color { r: 0.82, g: 0.82, b: 0.82, a: 1.0 };
|
||||
pub(super) const GROUP_LABEL: Color = Color { r: 0.50, g: 0.50, b: 0.50, a: 1.0 };
|
||||
pub(super) const TOOL_HOVER: Color = Color { r: 0.32, g: 0.32, b: 0.32, a: 1.0 };
|
||||
pub(super) const TOOL_ACTIVE: Color = Color { r: 0.18, g: 0.42, b: 0.70, a: 1.0 };
|
||||
pub(super) const ARROW_COLOR: Color = Color { r: 0.65, g: 0.65, b: 0.65, a: 1.0 };
|
||||
pub(super) const PANEL_BG: Color = Color { r: 0.16, g: 0.16, b: 0.16, a: 0.98 };
|
||||
pub(super) const PANEL_BORDER: Color = Color { r: 0.32, g: 0.32, b: 0.32, a: 1.0 };
|
||||
pub(super) const ROW_HOVER: Color = Color { r: 0.24, g: 0.24, b: 0.24, a: 1.0 };
|
||||
pub(super) const CHECK_COLOR: Color = Color { r: 0.20, g: 0.75, b: 0.35, a: 1.0 };
|
||||
pub(super) const ICON_COLOR: Color = Color { r: 0.25, g: 0.75, b: 0.45, a: 1.0 };
|
||||
pub(super) const LABEL_ON: Color = Color { r: 0.92, g: 0.92, b: 0.92, a: 1.0 };
|
||||
pub(super) const LABEL_OFF: Color = Color { r: 0.72, g: 0.72, b: 0.72, a: 1.0 };
|
||||
|
||||
// ── Layout helpers ─────────────────────────────────────────────────────────
|
||||
|
||||
/// Flush up-to-3 small items as a vertical column into the group row.
|
||||
pub(super) fn flush_small_col<'a>(
|
||||
buf: &mut Vec<Element<'a, Message>>,
|
||||
out: &mut Vec<Element<'a, Message>>,
|
||||
) {
|
||||
if buf.is_empty() {
|
||||
return;
|
||||
}
|
||||
let col = column(std::mem::take(buf)).spacing(1);
|
||||
out.push(col.into());
|
||||
}
|
||||
|
||||
pub(super) fn make_icon(icon: IconKind, size: f32) -> Element<'static, Message> {
|
||||
match icon {
|
||||
IconKind::Glyph(s) => text(s).size(size * 0.7).color(Color::WHITE).into(),
|
||||
IconKind::Svg(bytes) => {
|
||||
let handle = svg::Handle::from_memory(bytes);
|
||||
svg(handle).width(size).height(size).into()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn is_active_tool(
|
||||
id: &str,
|
||||
active_tool: &Option<String>,
|
||||
wireframe: bool,
|
||||
ortho_mode: bool,
|
||||
) -> bool {
|
||||
match id {
|
||||
"WIREFRAME" => wireframe,
|
||||
"SOLID" => !wireframe,
|
||||
"ORTHO" => ortho_mode,
|
||||
"PERSP" => !ortho_mode,
|
||||
id => active_tool.as_deref() == Some(id),
|
||||
}
|
||||
}
|
||||
|
||||
// ── Button style ───────────────────────────────────────────────────────────
|
||||
|
||||
pub(super) fn tool_btn_style(is_active: bool, status: button::Status) -> button::Style {
|
||||
button::Style {
|
||||
background: Some(Background::Color(match (is_active, status) {
|
||||
(true, _) => TOOL_ACTIVE,
|
||||
(_, button::Status::Hovered) => TOOL_HOVER,
|
||||
(_, button::Status::Pressed) => TOOL_ACTIVE,
|
||||
_ => Color::TRANSPARENT,
|
||||
})),
|
||||
text_color: Color::WHITE,
|
||||
border: Border {
|
||||
radius: 3.0.into(),
|
||||
color: Color::TRANSPARENT,
|
||||
width: 0.0,
|
||||
},
|
||||
shadow: iced::Shadow::default(),
|
||||
snap: false,
|
||||
}
|
||||
}
|
||||
|
||||
// ── Tooltip helpers ────────────────────────────────────────────────────────
|
||||
|
||||
pub(super) fn make_tip(tip: String) -> Element<'static, Message> {
|
||||
text(tip).size(11).color(Color::WHITE).into()
|
||||
}
|
||||
|
||||
pub(super) fn tip_style(_theme: &Theme) -> container::Style {
|
||||
container::Style {
|
||||
background: Some(Background::Color(Color {
|
||||
r: 0.13,
|
||||
g: 0.13,
|
||||
b: 0.13,
|
||||
a: 0.97,
|
||||
})),
|
||||
border: Border {
|
||||
color: Color { r: 0.35, g: 0.35, b: 0.35, a: 1.0 },
|
||||
width: 1.0,
|
||||
radius: 3.0.into(),
|
||||
},
|
||||
text_color: Some(Color::WHITE),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
// ── Small item renderer ────────────────────────────────────────────────────
|
||||
|
||||
/// Render a 1-row small button (Tool or Dropdown).
|
||||
pub(super) fn render_small<'a>(
|
||||
item: RibbonItem,
|
||||
active_tool: &Option<String>,
|
||||
open_dd: &Option<String>,
|
||||
last_cmd: &HashMap<&'static str, &'static str>,
|
||||
wireframe: bool,
|
||||
ortho_mode: bool,
|
||||
) -> Element<'a, Message> {
|
||||
match item {
|
||||
RibbonItem::Tool(t) => {
|
||||
let active = is_active_tool(t.id, active_tool, wireframe, ortho_mode);
|
||||
let event = t.event.clone();
|
||||
let tool_id = t.id.to_string();
|
||||
let tip_text = format!("{}\nCommand: {}", t.label, t.id);
|
||||
let btn = button(make_icon(t.icon, SMALL_ICON))
|
||||
.on_press(Message::RibbonToolClick { tool_id, event })
|
||||
.style(move |_: &Theme, status| tool_btn_style(active, status))
|
||||
.width(Length::Fixed(SMALL_W))
|
||||
.height(ROW_H)
|
||||
.padding([4, 4]);
|
||||
tooltip(btn, make_tip(tip_text), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style)
|
||||
.into()
|
||||
}
|
||||
|
||||
RibbonItem::Dropdown { id, icon, items, default, .. } => {
|
||||
let active = active_tool.as_deref() == Some(id)
|
||||
|| items
|
||||
.iter()
|
||||
.any(|(cmd, _, _)| active_tool.as_deref() == Some(cmd));
|
||||
let dd_open = open_dd.as_deref() == Some(id);
|
||||
let last = last_cmd.get(id).copied().unwrap_or(default);
|
||||
let cur_icon = last_cmd
|
||||
.get(id)
|
||||
.copied()
|
||||
.and_then(|cmd| {
|
||||
items.iter().find(|(c, _, _)| *c == cmd).map(|(_, _, ik)| *ik)
|
||||
})
|
||||
.or_else(|| items.first().map(|(_, _, ik)| *ik))
|
||||
.unwrap_or(icon);
|
||||
|
||||
let cur_label = last_cmd
|
||||
.get(id)
|
||||
.copied()
|
||||
.and_then(|cmd| {
|
||||
items.iter().find(|(c, _, _)| *c == cmd).map(|(_, lbl, _)| *lbl)
|
||||
})
|
||||
.or_else(|| items.first().map(|(_, lbl, _)| *lbl))
|
||||
.unwrap_or(id);
|
||||
let tip_text = format!("{}\nCommand: {}", cur_label, last);
|
||||
|
||||
let icon_btn = button(make_icon(cur_icon, SMALL_ICON))
|
||||
.on_press(Message::Command(last.to_string()))
|
||||
.style(move |_: &Theme, status| tool_btn_style(active, status))
|
||||
.width(Length::Fixed(SMALL_W))
|
||||
.height(ROW_H)
|
||||
.padding([4, 4]);
|
||||
|
||||
let arr_tip = format!("{} seçenekleri", cur_label);
|
||||
let arr_btn = button(
|
||||
container(text("▾").size(7).color(ARROW_COLOR))
|
||||
.width(Fill)
|
||||
.height(Fill)
|
||||
.align_x(iced::Center)
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.on_press(Message::ToggleRibbonDropdown(id.to_string()))
|
||||
.style(move |_: &Theme, status| button::Style {
|
||||
background: Some(Background::Color(match status {
|
||||
button::Status::Hovered | button::Status::Pressed => TOOL_HOVER,
|
||||
_ if dd_open => TOOL_ACTIVE,
|
||||
_ => Color::TRANSPARENT,
|
||||
})),
|
||||
border: Border { radius: 2.0.into(), ..Default::default() },
|
||||
..Default::default()
|
||||
})
|
||||
.width(Length::Fixed(ARROW_W))
|
||||
.height(ROW_H)
|
||||
.padding(0);
|
||||
|
||||
let icon_with_tip = tooltip(icon_btn, make_tip(tip_text), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style);
|
||||
let arr_with_tip = tooltip(arr_btn, make_tip(arr_tip), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style);
|
||||
|
||||
row![icon_with_tip, arr_with_tip].spacing(0).height(ROW_H).into()
|
||||
}
|
||||
|
||||
_ => text("").into(),
|
||||
}
|
||||
}
|
||||
|
||||
// ── Large item renderer ────────────────────────────────────────────────────
|
||||
|
||||
/// Render a full-height large button (LargeTool, LargeDropdown, or LayerCombo).
|
||||
pub(super) fn render_large<'a>(
|
||||
item: RibbonItem,
|
||||
active_tool: &Option<String>,
|
||||
open_dd: &Option<String>,
|
||||
last_cmd: &HashMap<&'static str, &'static str>,
|
||||
wireframe: bool,
|
||||
ortho_mode: bool,
|
||||
layer_infos: &'a [LayerInfo],
|
||||
active_layer: &'a str,
|
||||
active_color: AcadColor,
|
||||
active_linetype: &'a str,
|
||||
active_lineweight: LineWeight,
|
||||
) -> Element<'a, Message> {
|
||||
match item {
|
||||
RibbonItem::LargeTool(t) => {
|
||||
let active = is_active_tool(t.id, active_tool, wireframe, ortho_mode);
|
||||
let event = t.event.clone();
|
||||
let tool_id = t.id.to_string();
|
||||
let tip_text = format!("{}\nCommand: {}", t.label, t.id);
|
||||
let btn = button(
|
||||
column![
|
||||
make_icon(t.icon, LARGE_ICON),
|
||||
text(t.label).size(10).color(LABEL_COLOR),
|
||||
]
|
||||
.align_x(iced::Center)
|
||||
.spacing(3),
|
||||
)
|
||||
.on_press(Message::RibbonToolClick { tool_id, event })
|
||||
.style(move |_: &Theme, status| tool_btn_style(active, status))
|
||||
.width(Length::Fixed(LARGE_W))
|
||||
.height(Fill)
|
||||
.padding(Padding { top: 6.0, right: 4.0, bottom: 4.0, left: 4.0 });
|
||||
tooltip(btn, make_tip(tip_text), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style)
|
||||
.into()
|
||||
}
|
||||
|
||||
RibbonItem::LargeDropdown { id, label, icon, items, default } => {
|
||||
let active = active_tool.as_deref() == Some(id)
|
||||
|| items
|
||||
.iter()
|
||||
.any(|(cmd, _, _)| active_tool.as_deref() == Some(cmd));
|
||||
let dd_open = open_dd.as_deref() == Some(id);
|
||||
let last = last_cmd.get(id).copied().unwrap_or(default);
|
||||
let cur_icon = last_cmd
|
||||
.get(id)
|
||||
.copied()
|
||||
.and_then(|cmd| {
|
||||
items.iter().find(|(c, _, _)| *c == cmd).map(|(_, _, ik)| *ik)
|
||||
})
|
||||
.or_else(|| items.first().map(|(_, _, ik)| *ik))
|
||||
.unwrap_or(icon);
|
||||
|
||||
let cur_label = last_cmd
|
||||
.get(id)
|
||||
.copied()
|
||||
.and_then(|cmd| {
|
||||
items.iter().find(|(c, _, _)| *c == cmd).map(|(_, lbl, _)| *lbl)
|
||||
})
|
||||
.or_else(|| items.first().map(|(_, lbl, _)| *lbl))
|
||||
.unwrap_or(label);
|
||||
let tip_text = format!("{}\nCommand: {}", cur_label, last);
|
||||
let arr_tip = format!("{} seçenekleri", label);
|
||||
|
||||
let top_btn = button(
|
||||
column![
|
||||
make_icon(cur_icon, LARGE_ICON),
|
||||
text(label).size(10).color(LABEL_COLOR),
|
||||
]
|
||||
.align_x(iced::Center)
|
||||
.spacing(3),
|
||||
)
|
||||
.on_press(Message::Command(last.to_string()))
|
||||
.style(move |_: &Theme, status| tool_btn_style(active, status))
|
||||
.width(Length::Fixed(LARGE_W))
|
||||
.height(Fill)
|
||||
.padding(Padding { top: 6.0, right: 4.0, bottom: 2.0, left: 4.0 });
|
||||
|
||||
let arr_btn = button(
|
||||
container(text("▾").size(9).color(ARROW_COLOR))
|
||||
.width(Fill)
|
||||
.height(Fill)
|
||||
.align_x(iced::Center)
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.on_press(Message::ToggleRibbonDropdown(id.to_string()))
|
||||
.style(move |_: &Theme, status| button::Style {
|
||||
background: Some(Background::Color(match status {
|
||||
button::Status::Hovered | button::Status::Pressed => TOOL_HOVER,
|
||||
_ if dd_open => TOOL_ACTIVE,
|
||||
_ => Color::TRANSPARENT,
|
||||
})),
|
||||
border: Border { radius: 3.0.into(), ..Default::default() },
|
||||
..Default::default()
|
||||
})
|
||||
.width(Length::Fixed(LARGE_W))
|
||||
.height(LARGE_ARR)
|
||||
.padding(0);
|
||||
|
||||
let top_with_tip = tooltip(top_btn, make_tip(tip_text), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style);
|
||||
let arr_with_tip = tooltip(arr_btn, make_tip(arr_tip), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style);
|
||||
|
||||
column![top_with_tip, arr_with_tip]
|
||||
.spacing(0)
|
||||
.width(Length::Fixed(LARGE_W))
|
||||
.height(Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
RibbonItem::LayerComboGroup { row2, row3 } => {
|
||||
const COMBO_W: f32 = LARGE_W * 2.5;
|
||||
|
||||
let info = layer_infos.iter().find(|l| l.name == active_layer);
|
||||
let lc = info.map(|l| l.color).unwrap_or(Color::WHITE);
|
||||
let lv = info.map(|l| l.visible).unwrap_or(true);
|
||||
let lf = info.map(|l| l.frozen).unwrap_or(false);
|
||||
let ll = info.map(|l| l.locked).unwrap_or(false);
|
||||
let is_open = open_dd.as_deref() == Some(LAYER_COMBO_ID);
|
||||
|
||||
let vis_icon = text(if lv { "●" } else { "○" }).size(10).color(
|
||||
if lv { Color { r: 0.95, g: 0.85, b: 0.20, a: 1.0 } }
|
||||
else { Color { r: 0.45, g: 0.45, b: 0.45, a: 1.0 } },
|
||||
);
|
||||
let freeze_icon = text("✱").size(10).color(
|
||||
if lf { Color { r: 0.40, g: 0.80, b: 1.00, a: 1.0 } }
|
||||
else { Color { r: 0.95, g: 0.85, b: 0.20, a: 1.0 } },
|
||||
);
|
||||
let lock_icon = text(if ll { "🔒" } else { "🔓" }).size(10).color(
|
||||
if ll { Color { r: 0.95, g: 0.70, b: 0.20, a: 1.0 } }
|
||||
else { Color { r: 0.65, g: 0.65, b: 0.65, a: 1.0 } },
|
||||
);
|
||||
let swatch = container(text(""))
|
||||
.style(move |_: &Theme| container::Style {
|
||||
background: Some(Background::Color(lc)),
|
||||
border: Border {
|
||||
color: Color { r: 0.0, g: 0.0, b: 0.0, a: 0.5 },
|
||||
width: 1.0,
|
||||
radius: 1.0.into(),
|
||||
},
|
||||
..Default::default()
|
||||
})
|
||||
.width(12)
|
||||
.height(12);
|
||||
|
||||
const ICONS_USED: f32 = 10.0 + 10.0 + 10.0 + 12.0 + 10.0 + 5.0 * 4.0 + 16.0 + 16.0;
|
||||
let name_w = (COMBO_W - ICONS_USED).max(40.0);
|
||||
|
||||
let combo_btn = button(
|
||||
row![
|
||||
vis_icon, freeze_icon, lock_icon, swatch,
|
||||
container(text(active_layer).size(11).color(Color::WHITE))
|
||||
.width(name_w).clip(true),
|
||||
text("▾").size(9).color(Color { r: 0.7, g: 0.7, b: 0.7, a: 1.0 }),
|
||||
]
|
||||
.spacing(4)
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.on_press(Message::ToggleRibbonDropdown(LAYER_COMBO_ID.to_string()))
|
||||
.style(move |_: &Theme, status| button::Style {
|
||||
background: Some(Background::Color(match (is_open, status) {
|
||||
(true, _) => Color { r: 0.14, g: 0.14, b: 0.14, a: 1.0 },
|
||||
(_, button::Status::Hovered) => Color { r: 0.26, g: 0.26, b: 0.26, a: 1.0 },
|
||||
_ => Color { r: 0.18, g: 0.18, b: 0.18, a: 1.0 },
|
||||
})),
|
||||
border: Border {
|
||||
radius: 3.0.into(),
|
||||
width: 1.0,
|
||||
color: Color { r: 0.35, g: 0.35, b: 0.35, a: 1.0 },
|
||||
},
|
||||
..Default::default()
|
||||
})
|
||||
.padding([3, 8])
|
||||
.width(Fill);
|
||||
|
||||
let make_tool_row = |tools: Vec<ToolDef>| -> Element<Message> {
|
||||
let btns: Vec<Element<Message>> = tools
|
||||
.into_iter()
|
||||
.map(|t| {
|
||||
let is_active = active_tool.as_deref() == Some(t.id);
|
||||
let tip = t.label;
|
||||
let event = t.event.clone();
|
||||
let icon_el: Element<Message> = match t.icon {
|
||||
IconKind::Glyph(g) => text(g).size(13).color(Color::WHITE).into(),
|
||||
IconKind::Svg(bytes) => iced::widget::svg(
|
||||
iced::widget::svg::Handle::from_memory(bytes),
|
||||
)
|
||||
.width(16)
|
||||
.height(16)
|
||||
.into(),
|
||||
};
|
||||
let msg = module_event_to_message(event);
|
||||
tooltip(
|
||||
button(icon_el)
|
||||
.on_press(msg)
|
||||
.style(move |_: &Theme, status| tool_btn_style(is_active, status))
|
||||
.padding([2, 5]),
|
||||
make_tip(tip.to_string()),
|
||||
TipPos::Bottom,
|
||||
)
|
||||
.gap(4.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style)
|
||||
.into()
|
||||
})
|
||||
.collect();
|
||||
row(btns).spacing(2).align_y(iced::Center).into()
|
||||
};
|
||||
|
||||
let tools_row2 = make_tool_row(row2);
|
||||
let tools_row3 = make_tool_row(row3);
|
||||
|
||||
container(
|
||||
column![combo_btn, tools_row2, tools_row3]
|
||||
.spacing(3)
|
||||
.align_x(iced::Left),
|
||||
)
|
||||
.width(Length::Fixed(COMBO_W))
|
||||
.height(Fill)
|
||||
.align_y(iced::Center)
|
||||
.padding(Padding { top: 4.0, bottom: 4.0, left: 4.0, right: 4.0 })
|
||||
.into()
|
||||
}
|
||||
|
||||
RibbonItem::PropertiesGroup { match_prop } => {
|
||||
let mp_active = is_active_tool(match_prop.id, active_tool, wireframe, ortho_mode);
|
||||
let mp_event = match_prop.event.clone();
|
||||
let mp_id = match_prop.id.to_string();
|
||||
let mp_tip = format!("{}\nCommand: {}", match_prop.label, match_prop.id);
|
||||
let mp_btn = button(
|
||||
column![
|
||||
make_icon(match_prop.icon, LARGE_ICON),
|
||||
text(match_prop.label).size(10).color(LABEL_COLOR),
|
||||
]
|
||||
.align_x(iced::Center)
|
||||
.spacing(3),
|
||||
)
|
||||
.on_press(Message::RibbonToolClick { tool_id: mp_id, event: mp_event })
|
||||
.style(move |_: &Theme, status| tool_btn_style(mp_active, status))
|
||||
.width(Length::Fixed(LARGE_W))
|
||||
.height(Fill)
|
||||
.padding(Padding { top: 6.0, right: 4.0, bottom: 4.0, left: 4.0 });
|
||||
let mp_el = tooltip(mp_btn, make_tip(mp_tip), TipPos::Bottom)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style);
|
||||
|
||||
const PROP_W: f32 = 130.0;
|
||||
|
||||
let prop_row = |label: String, dd_id: &'static str, swatch: Option<Color>| {
|
||||
let is_open = open_dd.as_deref() == Some(dd_id);
|
||||
let swatch_el: Element<'a, Message> = if let Some(c) = swatch {
|
||||
container(text(""))
|
||||
.style(move |_: &Theme| container::Style {
|
||||
background: Some(Background::Color(c)),
|
||||
border: Border {
|
||||
color: Color { r: 0.0, g: 0.0, b: 0.0, a: 0.5 },
|
||||
width: 1.0,
|
||||
radius: 1.0.into(),
|
||||
},
|
||||
..Default::default()
|
||||
})
|
||||
.width(12)
|
||||
.height(12)
|
||||
.into()
|
||||
} else {
|
||||
iced::widget::Space::new().width(0).into()
|
||||
};
|
||||
button(
|
||||
row![
|
||||
swatch_el,
|
||||
container(text(label).size(10).color(Color::WHITE))
|
||||
.width(Fill)
|
||||
.clip(true),
|
||||
text(if is_open { "▲" } else { "▼" })
|
||||
.size(7)
|
||||
.color(Color { r: 0.6, g: 0.6, b: 0.6, a: 1.0 }),
|
||||
]
|
||||
.spacing(4)
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.on_press(Message::ToggleRibbonDropdown(dd_id.to_string()))
|
||||
.style(move |_: &Theme, status| button::Style {
|
||||
background: Some(Background::Color(match (is_open, status) {
|
||||
(true, _) => Color { r: 0.14, g: 0.14, b: 0.14, a: 1.0 },
|
||||
(_, button::Status::Hovered) => {
|
||||
Color { r: 0.26, g: 0.26, b: 0.26, a: 1.0 }
|
||||
}
|
||||
_ => Color { r: 0.18, g: 0.18, b: 0.18, a: 1.0 },
|
||||
})),
|
||||
border: Border {
|
||||
radius: 2.0.into(),
|
||||
width: 1.0,
|
||||
color: if is_open {
|
||||
Color { r: 0.45, g: 0.65, b: 0.90, a: 1.0 }
|
||||
} else {
|
||||
Color { r: 0.35, g: 0.35, b: 0.35, a: 1.0 }
|
||||
},
|
||||
},
|
||||
..Default::default()
|
||||
})
|
||||
.padding([3, 8])
|
||||
.width(Length::Fixed(PROP_W))
|
||||
};
|
||||
|
||||
let (color_swatch, color_label) = acad_color_display(active_color);
|
||||
let color_row = prop_row(color_label.to_string(), PROP_COLOR_ID, Some(color_swatch));
|
||||
let lt_row = prop_row(active_linetype.to_string(), PROP_LINETYPE_ID, None);
|
||||
let lw_row = prop_row(LwItem(active_lineweight).to_string(), PROP_LW_ID, None);
|
||||
|
||||
let combos = container(
|
||||
column![color_row, lt_row, lw_row].spacing(2).align_x(iced::Left),
|
||||
)
|
||||
.height(Fill)
|
||||
.align_y(iced::Center)
|
||||
.padding(Padding { top: 4.0, bottom: 4.0, left: 0.0, right: 4.0 });
|
||||
|
||||
row![mp_el, combos]
|
||||
.spacing(4)
|
||||
.align_y(iced::Center)
|
||||
.height(Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
_ => text("").into(),
|
||||
}
|
||||
}
|
||||
|
||||
// ── Dropdown position helpers ──────────────────────────────────────────────
|
||||
|
||||
/// Calculate the left pixel offset of a dropdown button inside the ribbon tool area.
|
||||
pub(super) fn compute_dropdown_left(
|
||||
groups: &[RibbonGroup],
|
||||
open_id: &str,
|
||||
) -> f32 {
|
||||
let sum_with_spacing = |widths: &[f32]| -> f32 {
|
||||
widths
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, &w)| if i == 0 { w } else { 2.0 + w })
|
||||
.sum::<f32>()
|
||||
};
|
||||
let next_item_x = |widths: &[f32]| -> f32 {
|
||||
if widths.is_empty() { 0.0 } else { sum_with_spacing(widths) + 2.0 }
|
||||
};
|
||||
|
||||
let mut x = 0.0f32;
|
||||
|
||||
for (g_idx, group) in groups.iter().enumerate() {
|
||||
if g_idx > 0 {
|
||||
x += 1.0;
|
||||
}
|
||||
x += 4.0;
|
||||
|
||||
let mut row_widths: Vec<f32> = Vec::new();
|
||||
let mut small_col_w: f32 = 0.0;
|
||||
let mut small_col_n: usize = 0;
|
||||
|
||||
for item in &group.tools {
|
||||
let is_large = matches!(
|
||||
item,
|
||||
RibbonItem::LargeTool(_)
|
||||
| RibbonItem::LargeDropdown { .. }
|
||||
| RibbonItem::LayerComboGroup { .. }
|
||||
| RibbonItem::PropertiesGroup { .. }
|
||||
);
|
||||
let id: &str = match item {
|
||||
RibbonItem::LargeTool(t) => t.id,
|
||||
RibbonItem::LargeDropdown { id, .. } => *id,
|
||||
RibbonItem::Tool(t) => t.id,
|
||||
RibbonItem::Dropdown { id, .. } => *id,
|
||||
RibbonItem::LayerComboGroup { .. } => LAYER_COMBO_ID,
|
||||
RibbonItem::PropertiesGroup { match_prop } => match_prop.id,
|
||||
};
|
||||
let item_w = match item {
|
||||
RibbonItem::LargeTool(_) | RibbonItem::LargeDropdown { .. } => LARGE_W,
|
||||
RibbonItem::LayerComboGroup { .. } => LARGE_W * 2.5,
|
||||
RibbonItem::PropertiesGroup { .. } => LARGE_W + 4.0 + 130.0,
|
||||
RibbonItem::Dropdown { .. } => SMALL_W + ARROW_W,
|
||||
_ => SMALL_W,
|
||||
};
|
||||
|
||||
if is_large {
|
||||
if small_col_n > 0 {
|
||||
row_widths.push(small_col_w);
|
||||
small_col_w = 0.0;
|
||||
small_col_n = 0;
|
||||
}
|
||||
if id == open_id {
|
||||
return x + next_item_x(&row_widths);
|
||||
}
|
||||
row_widths.push(item_w);
|
||||
} else {
|
||||
if id == open_id {
|
||||
return x + next_item_x(&row_widths);
|
||||
}
|
||||
small_col_w = small_col_w.max(item_w);
|
||||
small_col_n += 1;
|
||||
if small_col_n == 3 {
|
||||
row_widths.push(small_col_w);
|
||||
small_col_w = 0.0;
|
||||
small_col_n = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if small_col_n > 0 {
|
||||
row_widths.push(small_col_w);
|
||||
}
|
||||
x += sum_with_spacing(&row_widths) + 4.0;
|
||||
}
|
||||
|
||||
60.0
|
||||
}
|
||||
|
||||
pub(super) fn compute_layer_combo_left(groups: &[RibbonGroup]) -> f32 {
|
||||
compute_dropdown_left(groups, LAYER_COMBO_ID)
|
||||
}
|
||||
|
||||
/// Left offset for a Properties combo dropdown.
|
||||
pub(super) fn compute_prop_combo_left(groups: &[RibbonGroup], _dd_id: &str) -> f32 {
|
||||
let base = compute_dropdown_left(groups, "MATCHPROP");
|
||||
base + LARGE_W + 4.0
|
||||
}
|
||||
|
||||
pub(super) fn compute_history_dropdown_left(open_id: &str) -> f32 {
|
||||
let logo_w = 38.0;
|
||||
let leading_gap = 6.0;
|
||||
let ctrl_w = TOP_HIST_W + TOP_ARR_W;
|
||||
|
||||
match open_id {
|
||||
UNDO_HISTORY_ID => logo_w + leading_gap,
|
||||
REDO_HISTORY_ID => logo_w + leading_gap + ctrl_w + TOP_HIST_GAP,
|
||||
_ => logo_w + leading_gap,
|
||||
}
|
||||
}
|
||||
|
||||
// ── Message helpers ────────────────────────────────────────────────────────
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn module_event_to_message(event: ModuleEvent) -> Message {
|
||||
match event {
|
||||
ModuleEvent::Command(cmd) => Message::Command(cmd),
|
||||
ModuleEvent::OpenFileDialog => Message::OpenFile,
|
||||
ModuleEvent::ClearModels => Message::ClearScene,
|
||||
ModuleEvent::SetWireframe(w) => Message::SetWireframe(w),
|
||||
ModuleEvent::ToggleLayers => Message::ToggleLayers,
|
||||
}
|
||||
}
|
||||
|
||||
// ── History control ────────────────────────────────────────────────────────
|
||||
|
||||
pub(super) fn render_history_control<'a>(
|
||||
glyph: &'static str,
|
||||
label: &'static str,
|
||||
dropdown_id: &'static str,
|
||||
count: usize,
|
||||
open_dropdown: &Option<String>,
|
||||
) -> Element<'a, Message> {
|
||||
let dd_open = open_dropdown.as_deref() == Some(dropdown_id);
|
||||
let active = count > 0;
|
||||
|
||||
let main_btn = {
|
||||
let btn = button(
|
||||
text(glyph).size(14).color(if active { Color::WHITE } else { LABEL_OFF }),
|
||||
)
|
||||
.style(move |_: &Theme, status| top_hist_btn_style(active, dd_open, status))
|
||||
.width(Length::Fixed(TOP_HIST_W))
|
||||
.height(24)
|
||||
.padding([2, 0]);
|
||||
let btn = if active {
|
||||
if dropdown_id == UNDO_HISTORY_ID {
|
||||
btn.on_press(Message::Undo)
|
||||
} else {
|
||||
btn.on_press(Message::Redo)
|
||||
}
|
||||
} else {
|
||||
btn
|
||||
};
|
||||
tooltip(
|
||||
btn,
|
||||
make_tip(format!("{label}\n{count} steps available")),
|
||||
TipPos::Bottom,
|
||||
)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style)
|
||||
};
|
||||
|
||||
let arrow_btn = {
|
||||
let btn = button(
|
||||
container(
|
||||
text("▾").size(7).color(if active { ARROW_COLOR } else { LABEL_OFF }),
|
||||
)
|
||||
.width(Fill)
|
||||
.height(Fill)
|
||||
.align_x(iced::Center)
|
||||
.align_y(iced::Center),
|
||||
)
|
||||
.style(move |_: &Theme, status| top_hist_btn_style(active, dd_open, status))
|
||||
.width(Length::Fixed(TOP_ARR_W))
|
||||
.height(24)
|
||||
.padding(0);
|
||||
let btn = if active {
|
||||
btn.on_press(Message::ToggleRibbonDropdown(dropdown_id.to_string()))
|
||||
} else {
|
||||
btn
|
||||
};
|
||||
tooltip(
|
||||
btn,
|
||||
make_tip(format!("Choose {label} history")),
|
||||
TipPos::Bottom,
|
||||
)
|
||||
.gap(6.0)
|
||||
.delay(Duration::from_millis(400))
|
||||
.style(tip_style)
|
||||
};
|
||||
|
||||
row![main_btn, arrow_btn].spacing(0).into()
|
||||
}
|
||||
|
||||
pub(super) fn top_hist_btn_style(
|
||||
active: bool,
|
||||
open: bool,
|
||||
status: button::Status,
|
||||
) -> button::Style {
|
||||
button::Style {
|
||||
background: Some(Background::Color(match (active, open, status) {
|
||||
(false, _, _) => Color { r: 0.20, g: 0.20, b: 0.20, a: 1.0 },
|
||||
(_, true, _) => TOOL_ACTIVE,
|
||||
(_, _, button::Status::Hovered) => TOOL_HOVER,
|
||||
(_, _, button::Status::Pressed) => TOOL_ACTIVE,
|
||||
_ => Color::TRANSPARENT,
|
||||
})),
|
||||
text_color: Color::WHITE,
|
||||
border: Border {
|
||||
radius: 3.0.into(),
|
||||
color: Color::TRANSPARENT,
|
||||
width: 0.0,
|
||||
},
|
||||
shadow: iced::Shadow::default(),
|
||||
snap: false,
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue