Merge remote-tracking branch 'origin/main' into codex/field-command

# Conflicts:
#	src/ui/window/attdef_dialog.rs
This commit is contained in:
ramox81 committed 2026-10-02 10:46:53 +03:00
commit 762cf1e7e4
68 files changed
+4665 -1048

No files matched your search

+9 -8
View File
@@ -92,6 +92,7 @@ fn reorder_insertion_index(from: usize, to: usize, after: bool, len: usize) -> O
mod command;
mod context_menu;
mod blocks_palette;
mod dialog;
mod dynamic;
mod file;
@@ -988,6 +989,9 @@ impl OpenCADStudio {
.extension()
.map(|e| e.to_string_lossy().to_lowercase())
.unwrap_or_default();
if ext == "scr" {
return self.dispatch_command(&format!("SCRIPT \"{}\"", path.display()));
}
if !matches!(ext.as_str(), "dwg" | "dxf" | "bak" | "sv$") {
self.command_line.push_error(
crate::tf!("Unsupported file type: {}", path.display()).as_ref(),
@@ -2526,13 +2530,7 @@ impl OpenCADStudio {
self.dispatch_command(&cmd)
}
Message::ScriptLine(line) => {
if line.trim().is_empty() {
self.feed_command(crate::command::StepInput::Enter)
} else {
self.run_command_line(&line)
}
}
Message::ScriptLine(line) => self.feed_script_line(&line),
Message::ToggleLayers => {
if self.active_modal == Some(super::ModalKind::Layers) {
@@ -5776,6 +5774,9 @@ impl OpenCADStudio {
if self.tabs[self.active_tab].is_start {
self.ribbon.close_dropdown();
} else {
if id == crate::modules::insert::insert_block::GALLERY_ID {
self.refresh_block_palette();
}
self.ribbon.toggle_dropdown(&id);
}
Task::none()
@@ -8247,7 +8248,7 @@ impl OpenCADStudio {
}
Message::ZoomFactorChanged(factor) => {
self.zoom_factor = factor.clamp(3, 100);
self.zoom_factor = factor.clamp(3, 500);
self.persist_settings_if_changed();
Task::none()
}