fix: preserve web builds and leader selection order

This commit is contained in:
Hakan Seven committed 2026-09-09 13:10:21 +03:00
1 parent 6d5763bb70
commit cba2680be0
5 files changed
+38 -68

No files matched your search

-24
View File
@@ -106,14 +106,6 @@ impl OpenCADStudio {
&handles,
);
let count = self.copy_entities_to_clipboard(i, &handles, base);
// Copy to system clipboard as JSON for web/cross-platform support
if let Ok(clipboard_data) = serde_json::to_string(&self.clipboard) {
return Some(iced::clipboard::write(format!(
"OCS_CLIPBOARD_JSON\n{}\n{}",
serde_json::json!([base.x, base.y, base.z]).to_string(),
clipboard_data
)).discard());
}
self.command_line.push_info(crate::tf!(
"{} object(s) copied to clipboard.",
count
@@ -159,14 +151,6 @@ impl OpenCADStudio {
if coords.len() == 3 && !handles.is_empty() {
let base = glam::DVec3::new(coords[0], coords[1], coords[2]);
let count = self.copy_entities_to_clipboard(i, &handles, base);
// Copy to system clipboard as JSON for web/cross-platform support
if let Ok(clipboard_data) = serde_json::to_string(&self.clipboard) {
let _ = iced::clipboard::write(format!(
"OCS_CLIPBOARD_JSON\n{}\n{}",
serde_json::json!([base.x, base.y, base.z]).to_string(),
clipboard_data
));
}
self.command_line.push_info(crate::tf!(
"{} object(s) copied to clipboard (base {:.3},{:.3}).",
count,
@@ -195,14 +179,6 @@ impl OpenCADStudio {
&handles,
);
let count = self.copy_entities_to_clipboard(i, &handles, base);
// Copy to system clipboard as JSON for web/cross-platform support
if let Ok(clipboard_data) = serde_json::to_string(&self.clipboard) {
let _ = iced::clipboard::write(format!(
"OCS_CLIPBOARD_JSON\n{}\n{}",
serde_json::json!([base.x, base.y, base.z]).to_string(),
clipboard_data
));
}
self.push_undo_snapshot(i, "CUTCLIP");
self.tabs[i].scene.erase_entities(&handles);
self.tabs[i].scene.deselect_all();
+4 -4
View File
@@ -35,7 +35,7 @@ impl OpenCADStudio {
// A 186 468-entity selection spends ~112 ms in here. Split it into the
// three phases that can own that: resolving the selected handles,
// building the panel, and syncing the ribbon.
let t_all = crate::perf::enabled().then(std::time::Instant::now);
let t_all = crate::perf::enabled().then(iced::time::Instant::now);
let i = self.active_tab;
if !crate::entities::object_data::cache_is_prepared(
&self.tabs[i].scene.object_data_cache,
@@ -112,7 +112,7 @@ impl OpenCADStudio {
// Everything before this is the prelude: the object-data cache, the
// unit context, the layer and linetype lists.
let m_prelude = t_all.map(|t| t.elapsed().as_secs_f64() * 1000.0);
let t_handles = crate::perf::enabled().then(std::time::Instant::now);
let t_handles = crate::perf::enabled().then(iced::time::Instant::now);
// `selected_entities` resolves every handle to an entity and builds a
// vector of pairs; only the handles are wanted here, but the resolution
// is what decides membership — a handle whose entity is gone is not in
@@ -2196,7 +2196,7 @@ impl OpenCADStudio {
// the active group, moving into the working plane, and
// aggregating into "varies" rows. `properties-detail`
// reports this whole arm as `rest`; this splits it.
let t_arm = crate::perf::enabled().then(std::time::Instant::now);
let t_arm = crate::perf::enabled().then(iced::time::Instant::now);
let groups = build_selection_groups(&selected);
let t_groups = t_arm.map(|t| t.elapsed().as_secs_f64() * 1000.0);
let active_group = selected_group
@@ -2372,7 +2372,7 @@ filter={:.1} local={:.1} aggregate={:.1} entities={}",
self.tabs[i].properties = new_panel;
self.refresh_selected_grips();
let m_panel = t_all.map(|t| t.elapsed().as_secs_f64() * 1000.0);
let t_ribbon = crate::perf::enabled().then(std::time::Instant::now);
let t_ribbon = crate::perf::enabled().then(iced::time::Instant::now);
self.sync_ribbon_from_selection();
if let Some(t) = t_all {
let ribbon_ms = t_ribbon.map_or(0.0, |r| r.elapsed().as_secs_f64() * 1000.0);