forked from 1b-agent/opencadstudio-upstream
fix(rect): merge current main
Preserve both Point and Rectangle property layouts where the two pull requests changed the same section.
This commit is contained in:
commit
e74d5d78fc
98 files changed
+1167
-268
No files matched your search
Vendored
+9
@@ -95,6 +95,15 @@ pub fn general_section(entity: &EntityType) -> PropSection {
|
||||
section.props.retain(|prop| prop.field != "handle");
|
||||
}
|
||||
|
||||
if matches!(entity, EntityType::Point(_)) {
|
||||
section.props.retain(|prop| prop.field != "handle");
|
||||
let hyperlink = section.props.iter().position(|prop| prop.field == "hyperlink");
|
||||
let transparency = section.props.iter().position(|prop| prop.field == "transparency");
|
||||
if let (Some(hyperlink), Some(transparency)) = (hyperlink, transparency) {
|
||||
section.props.swap(hyperlink, transparency);
|
||||
}
|
||||
}
|
||||
|
||||
// Thickness (DXF 39) is a General-group property, but only the entity
|
||||
// types that carry an extrusion thickness expose it (line, circle, arc,
|
||||
// polyline, text, 2D solid, …). Show it right after Hyperlink for those.
|
||||
|
||||
Reference in new issue
Block a user