AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(layers): multi-select layers in the Layer Manager (#236)

Browse source 
The Layer Manager only allowed one layer at a time. Now:

- Ctrl/Cmd-click toggles a layer in the selection; Shift-click selects
  the range from the anchor; a plain click selects just one.
- Colour, linetype and lineweight changes apply to every selected layer.
- Delete removes all selected layers at once (reusing the #237 non-empty
  warning, now pluralised); layer "0" and the current layer are skipped.

Selection is stored as row indices but re-resolved by name across sorts
and layer-table rebuilds, so it never points at the wrong rows. Modifier
state is tracked via a new SetModifiers message (shift + ctrl/cmd).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-07-01 17:44:19 +03:00
commit ada9952f06
6 changed files with 178 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/app/update/command.rs
View file

@ -614,6 +614,7 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
.position(|l| l.name == new_name);
if let Some(idx) = new_idx {
self.tabs[i].layers.selected = Some(idx);
self.tabs[i].layers.selected_multi = vec![idx];
self.tabs[i].layers.editing = Some(idx);
self.tabs[i].layers.edit_buf = new_name.clone();
}
@ -623,56 +624,53 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
pub(super) fn on_layer_delete(&mut self) -> Task<Message> {
let i = self.active_tab;
let Some(idx) = self.tabs[i].layers.selected else {
return Task::none();
};
let name = self.tabs[i]
.layers
.layers
.get(idx)
.map(|l| l.name.clone())
.unwrap_or_default();
if name.is_empty() {
// Every selected layer (multi-select), or the anchor if none.
let mut names = self.selected_layer_names(i);
if names.is_empty() {
return Task::none();
}
if name == "0" {
// Layer "0" and the current layer can't be deleted — drop them
// from the batch and note it.
let current = self.tabs[i].scene.document.header.current_layer_name.clone();
let before = names.len();
names.retain(|n| n != "0" && *n != current);
if names.len() < before {
self.command_line
.push_error("Layer \"0\" cannot be deleted.");
.push_info("Layer \"0\" and the current layer can't be deleted — skipped.");
}
if names.is_empty() {
return Task::none();
}
if name == self.tabs[i].scene.document.header.current_layer_name {
self.command_line
.push_error("Cannot delete the current layer. Set another layer current first.");
return Task::none();
}
// Count objects on the layer. Empty → delete straight away;
// Total objects across the layers. Empty → delete straight away;
// non-empty → warn first (deleting also removes those objects).
let count = self.tabs[i]
.scene
.document
.entities()
.filter(|e| e.common().layer == name)
.filter(|e| names.contains(&e.common().layer))
.count();
if count == 0 {
self.push_undo_snapshot(i, "LAYER DELETE");
self.tabs[i].scene.document.layers.remove(&name);
for name in &names {
self.tabs[i].scene.document.layers.remove(name);
}
self.tabs[i].dirty = true;
self.sync_layer_panel(i);
} else {
self.layer_delete_pending = Some((name, count));
self.layer_delete_pending = Some((names, count));
self.active_modal = Some(crate::app::ModalKind::LayerDeleteWarning);
self.modal_offset = iced::Vector::ZERO;
}
Task::none()
}
/// User confirmed deleting a non-empty layer: erase every object on it,
/// then remove the layer record.
/// User confirmed deleting non-empty layer(s): erase every object on them,
/// then remove the layer records.
pub(super) fn on_layer_delete_confirm(&mut self) -> Task<Message> {
let i = self.active_tab;
self.active_modal = None;
self.modal_offset = iced::Vector::ZERO;
let Some((name, _)) = self.layer_delete_pending.take() else {
let Some((names, _)) = self.layer_delete_pending.take() else {
return Task::none();
};
self.push_undo_snapshot(i, "LAYER DELETE");
@ -680,12 +678,14 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
.scene
.document
.entities()
.filter(|e| e.common().layer == name)
.filter(|e| names.contains(&e.common().layer))
.map(|e| e.common().handle)
.collect();
// Remove the layer record first so the lock guard in `erase_entities`
// Remove the layer records first so the lock guard in `erase_entities`
// (which looks the layer up by name) can't block the objects.
self.tabs[i].scene.document.layers.remove(&name);
for name in &names {
self.tabs[i].scene.document.layers.remove(name);
}
self.tabs[i].scene.erase_entities(&handles);
self.tabs[i].dirty = true;
self.sync_layer_panel(i);
@ -693,12 +693,28 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
Task::none()
}
/// Layer names for the current Layer-manager selection — every row in the
/// multi-selection, or the anchor row when the multi-set is empty. Bulk
/// property edits and deletion act on these.
pub(super) fn selected_layer_names(&self, i: usize) -> Vec<String> {
let panel = &self.tabs[i].layers;
let idxs: Vec<usize> = if panel.selected_multi.is_empty() {
panel.selected.into_iter().collect()
} else {
panel.selected_multi.clone()
};
idxs.iter()
.filter_map(|&x| panel.layers.get(x).map(|l| l.name.clone()))
.collect()
}
/// Rebuild the Layer-manager panel + ribbon after a layer-table change.
fn sync_layer_panel(&mut self, i: usize) {
let doc_layers = self.tabs[i].scene.document.layers.clone();
let vp_info = self.tabs[i].scene.viewport_list();
self.tabs[i].layers.sync_with_viewports(&doc_layers, vp_info);
self.tabs[i].layers.selected = None;
self.tabs[i].layers.selected_multi.clear();
self.sync_ribbon_layers();
}

99
src/app/update/mod.rs
View file

@ -925,13 +925,32 @@ impl OpenCADStudio {
if self.tabs[i].layers.editing.is_some() {
return Task::done(Message::LayerRenameCommit);
}
self.tabs[i].layers.selected = Some(idx);
let (shift, ctrl) = (self.shift_down, self.ctrl_down);
let panel = &mut self.tabs[i].layers;
if ctrl {
// Ctrl/Cmd-click toggles this row in the selection.
if let Some(pos) = panel.selected_multi.iter().position(|&x| x == idx) {
panel.selected_multi.remove(pos);
} else {
panel.selected_multi.push(idx);
}
} else if shift {
// Shift-click selects the range from the anchor to here.
let anchor = panel.selected.unwrap_or(idx);
let (lo, hi) = (anchor.min(idx), anchor.max(idx));
panel.selected_multi = (lo..=hi).collect();
} else {
// Plain click selects just this row.
panel.selected_multi = vec![idx];
}
panel.selected = Some(idx);
Task::none()
}
Message::LayerRenameStart(idx) => {
let i = self.active_tab;
self.tabs[i].layers.selected = Some(idx);
self.tabs[i].layers.selected_multi = vec![idx];
if let Some(layer) = self.tabs[i].layers.layers.get(idx) {
self.tabs[i].layers.edit_buf = layer.name.clone();
}
@ -957,6 +976,12 @@ impl OpenCADStudio {
panel.color_picker_row = Some(idx);
panel.color_full_palette = false;
panel.selected = Some(idx);
// Opening the swatch on a row outside the current
// multi-selection narrows to just that row; on a selected
// row it keeps the multi-selection so the pick applies to all.
if !panel.selected_multi.contains(&idx) {
panel.selected_multi = vec![idx];
}
}
Task::none()
}
@ -969,23 +994,26 @@ impl OpenCADStudio {
Message::LayerColorSet(aci) => {
let i = self.active_tab;
if let Some(idx) = self.tabs[i].layers.selected {
if let Some(layer) = self.tabs[i].layers.layers.get(idx) {
let name = layer.name.clone();
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(&name) {
// Apply to every selected layer (multi-select), not just one.
let names = self.selected_layer_names(i);
if !names.is_empty() {
use crate::ui::window::layers::iced_color_from_acad;
let new_color = iced_color_from_acad(&AcadColor::Index(aci));
for name in &names {
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(name) {
dl.color = AcadColor::Index(aci);
}
use crate::ui::window::layers::iced_color_from_acad;
let new_color = iced_color_from_acad(&AcadColor::Index(aci));
if let Some(pl) = self.tabs[i].layers.layers.get_mut(idx) {
}
for pl in self.tabs[i].layers.layers.iter_mut() {
if names.contains(&pl.name) {
pl.color = new_color;
}
self.tabs[i].dirty = true;
// ByLayer color is baked into the cached wires at
// tessellation time, so bump the geometry epoch to
// invalidate the wire cache and repaint with the new color.
self.tabs[i].scene.bump_geometry();
}
self.tabs[i].dirty = true;
// ByLayer color is baked into the cached wires at
// tessellation time, so bump the geometry epoch to
// invalidate the wire cache and repaint with the new color.
self.tabs[i].scene.bump_geometry();
self.tabs[i].layers.color_picker_row = None;
self.tabs[i].layers.color_full_palette = false;
self.sync_ribbon_layers();
@ -995,38 +1023,42 @@ impl OpenCADStudio {
Message::LayerLinetypeSet(lt) => {
let i = self.active_tab;
if let Some(idx) = self.tabs[i].layers.selected {
if let Some(layer) = self.tabs[i].layers.layers.get(idx) {
let name = layer.name.clone();
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(&name) {
let names = self.selected_layer_names(i);
if !names.is_empty() {
for name in &names {
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(name) {
dl.line_type = lt.clone();
}
if let Some(pl) = self.tabs[i].layers.layers.get_mut(idx) {
pl.linetype = lt;
}
self.tabs[i].dirty = true;
// Linetype is baked into the cached wires; repaint.
self.tabs[i].scene.bump_geometry();
}
for pl in self.tabs[i].layers.layers.iter_mut() {
if names.contains(&pl.name) {
pl.linetype = lt.clone();
}
}
self.tabs[i].dirty = true;
// Linetype is baked into the cached wires; repaint.
self.tabs[i].scene.bump_geometry();
}
Task::none()
}
Message::LayerLineweightSet(lw) => {
let i = self.active_tab;
if let Some(idx) = self.tabs[i].layers.selected {
if let Some(layer) = self.tabs[i].layers.layers.get(idx) {
let name = layer.name.clone();
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(&name) {
let names = self.selected_layer_names(i);
if !names.is_empty() {
for name in &names {
if let Some(dl) = self.tabs[i].scene.document.layers.get_mut(name) {
dl.line_weight = lw;
}
if let Some(pl) = self.tabs[i].layers.layers.get_mut(idx) {
}
for pl in self.tabs[i].layers.layers.iter_mut() {
if names.contains(&pl.name) {
pl.lineweight = lw;
}
self.tabs[i].dirty = true;
// Lineweight is baked into the cached wires; repaint.
self.tabs[i].scene.bump_geometry();
}
self.tabs[i].dirty = true;
// Lineweight is baked into the cached wires; repaint.
self.tabs[i].scene.bump_geometry();
}
Task::none()
}
@ -1585,8 +1617,9 @@ impl OpenCADStudio {
Task::none()
}
Message::SetShiftDown(down) => {
self.shift_down = down;
Message::SetModifiers { shift, ctrl } => {
self.shift_down = shift;
self.ctrl_down = ctrl;
Task::none()
}