forked from 1b-agent/opencadstudio-upstream
Merge pull request #1203 from Ramox81/codex/parity-pedit-jointype-20260911
This commit is contained in:
commit
173552ed0e
2 files changed
+128
-21
No files matched your search
@@ -1313,14 +1313,14 @@ impl OpenCADStudio {
|
||||
|
||||
if !matches!(
|
||||
&op,
|
||||
PeditOp::Multiple(_, _) | PeditOp::JoinSelection(_, _)
|
||||
PeditOp::Multiple(_, _) | PeditOp::JoinSelection(_, _, _)
|
||||
)
|
||||
&& self.reject_locked_edit(tab, handle)
|
||||
{
|
||||
return Task::none();
|
||||
}
|
||||
match &op {
|
||||
PeditOp::JoinSelection(handles, fuzz) => {
|
||||
PeditOp::JoinSelection(handles, fuzz, kind) => {
|
||||
let mut available = handles
|
||||
.iter()
|
||||
.filter_map(|handle| {
|
||||
@@ -1335,6 +1335,7 @@ impl OpenCADStudio {
|
||||
.map(|entity| (*handle, entity))
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
let connector_distance = crate::modules::draw::modify::pedit::selection_connector_distance(&available, *fuzz);
|
||||
let mut changes = Vec::new();
|
||||
while !available.is_empty() {
|
||||
let (source_handle, source) = available.remove(0);
|
||||
@@ -1347,6 +1348,8 @@ impl OpenCADStudio {
|
||||
&source,
|
||||
&candidates,
|
||||
*fuzz,
|
||||
*kind,
|
||||
connector_distance,
|
||||
)
|
||||
{
|
||||
*result.common_mut() = source.common().clone();
|
||||
|
||||
Reference in new issue
Block a user