1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

fix(io): trust decoded current layer

Browse Source 
Remove the application-side CLAYER fallback now that cadcodec resolves the header handle during document construction.

Refs #743
This commit is contained in:
Hakan Seven committed 2026-08-25 23:21:24 +03:00
1 parent 450135960c
commit b2b84283ae
3 files changed
+9 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/update/file.rs
+6 -28
View File
@@ -1187,34 +1187,12 @@ pub(super) fn on_open_file(&mut self) -> Task<Message> {
self.tabs[i].scene.material_base_dir =
path.parent().map(std::path::Path::to_path_buf);
self.tabs[i].scene.document = doc;
// DWG stores CLAYER as a layer handle. Resolve that handle back to
// the layer name after opening so the per-tab creation state and
// header name stay in sync. DXF already provides current_layer_name,
// so keep it as a fallback.
let current_layer = {
let doc = &self.tabs[i].scene.document;
doc.layers
.iter()
.find(|layer| layer.handle == doc.header.current_layer_handle)
.map(|layer| (layer.name.clone(), layer.handle))
.or_else(|| {
doc.layers
.get(&doc.header.current_layer_name)
.map(|layer| (layer.name.clone(), layer.handle))
})
.or_else(|| {
doc.layers
.get("0")
.map(|layer| (layer.name.clone(), layer.handle))
})
};
if let Some((name, handle)) = current_layer {
self.tabs[i].scene.document.header.current_layer_name = name.clone();
self.tabs[i].scene.document.header.current_layer_handle = handle;
self.tabs[i].active_layer = name;
}
self.tabs[i].active_layer = self.tabs[i]
.scene
.document
.header
.current_layer_name
.clone();
// A file saved without the built-in Standard styles (foreign
// or damaged) gets them re-seeded so nothing dangles (#366).
crate::app::style_ops::ensure_standard_styles(