forked from 1b-agent/opencadstudio-upstream
Merge main into Pallet-placement
Resolved conflicts: - app/update/mod.rs: keep the dock's dock_open_at_default for the XREF manager; take main's stable xref row identity (row_index(&id)). - app/view/mod.rs: keep the edge layout from app::dock; drop main's copy of the old edge-stack code (main only reformatted it there). - ui/window/layers.rs: keep main's new visible_indices next to the branch's view_panel. Files the branch only reformatted take main's version. Adds the Lao (lo-LA) translations for the new dock texts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013RyGiMXcsf9HTKfqDxaQGt
This commit is contained in:
136 files changed
+12408
-949
No files matched your search
+18
-8
@@ -293,6 +293,8 @@ impl OpenCADStudio {
|
||||
cliprompt_lines: self.cliprompt_lines,
|
||||
commandline_fade_ms: self.commandline_fade_ms,
|
||||
zoom_wheel_reversed: self.zoom_wheel_reversed,
|
||||
touchpad_pan: self.touchpad_pan,
|
||||
ui_scale_percent: self.ui_scale_percent,
|
||||
zoom_factor: self.zoom_factor,
|
||||
texteditmode: self.texteditmode,
|
||||
dimension_continue_mode: self.dimension_continue_mode,
|
||||
@@ -619,14 +621,22 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
linetypes.sort_by_key(|name| name.to_lowercase());
|
||||
sized_flow(ex, 1180, 560, |flow| {
|
||||
crate::ui::window::layer_state_manager::view_editor(
|
||||
state,
|
||||
&self.layer_state_edit_filter,
|
||||
self.layer_state_edit_color_open,
|
||||
linetypes.clone(),
|
||||
flow,
|
||||
)
|
||||
// Shared ownership: the build closure runs twice per frame
|
||||
// (INTRINSIC + FILL) and each row keeps its own copy, so a
|
||||
// borrow cannot work here — an Arc clone per row is a
|
||||
// refcount bump instead of N string clones (#21, cf. #34).
|
||||
let linetypes = std::sync::Arc::<[String]>::from(linetypes);
|
||||
sized_flow(ex, 1180, 560, {
|
||||
let linetypes = std::sync::Arc::clone(&linetypes);
|
||||
move |flow| {
|
||||
crate::ui::window::layer_state_manager::view_editor(
|
||||
state,
|
||||
&self.layer_state_edit_filter,
|
||||
self.layer_state_edit_color_open,
|
||||
std::sync::Arc::clone(&linetypes),
|
||||
flow,
|
||||
)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
automatic_flow(ex, |flow| {
|
||||
|
||||
Reference in new issue
Block a user