forked from 1b-agent/opencadstudio-upstream
Merge pull request #1331 from ramox81/codex/smooth-constraint-parity
# Conflicts: # src/app/commands/styleprops.rs
This commit is contained in:
commit
76451f7298
18 files changed
+762
-127
No files matched your search
@@ -1739,15 +1739,13 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
|
||||
.get_entity(popup.handle)
|
||||
.is_some_and(|entity| match (item.action, entity) {
|
||||
(GripMenuAction::ShowFit, acadrust::EntityType::Spline(spline)) => {
|
||||
!spline.cv_frame_visible
|
||||
&& crate::entities::spline::uses_fit_method(spline)
|
||||
crate::entities::spline::shows_fit_points(spline)
|
||||
}
|
||||
(
|
||||
GripMenuAction::ShowControlVertices,
|
||||
acadrust::EntityType::Spline(spline),
|
||||
) => {
|
||||
spline.cv_frame_visible
|
||||
|| !crate::entities::spline::uses_fit_method(spline)
|
||||
crate::entities::spline::shows_control_vertices(spline)
|
||||
}
|
||||
_ => false,
|
||||
});
|
||||
|
||||
@@ -521,6 +521,7 @@ impl OpenCADStudio {
|
||||
constraint_solve_mode: self.constraint_solve_mode,
|
||||
constraint_infer: self.constraint_infer,
|
||||
constraint_bar_display: self.constraint_bar_display,
|
||||
constraint_bar_mode: self.constraint_bar_mode,
|
||||
savetime_min: self.savetime_min,
|
||||
default_save_format: self.default_save_format.clone(),
|
||||
pick_add: self.pick_add,
|
||||
@@ -624,6 +625,7 @@ impl OpenCADStudio {
|
||||
self.constraint_solve_mode = s.constraint_solve_mode;
|
||||
self.constraint_infer = s.constraint_infer;
|
||||
self.constraint_bar_display = s.constraint_bar_display.clamp(0, 3);
|
||||
self.constraint_bar_mode = s.constraint_bar_mode.clamp(0, 4095);
|
||||
self.savetime_min = s.savetime_min;
|
||||
self.default_save_format =
|
||||
crate::io::canonical_save_format(&s.default_save_format).to_string();
|
||||
|
||||
@@ -3051,6 +3051,7 @@ impl OpenCADStudio {
|
||||
vp_size,
|
||||
self.show_constraint_values,
|
||||
self.constraint_bar_display,
|
||||
self.constraint_bar_mode,
|
||||
cursor,
|
||||
)?;
|
||||
let set = self.tabs[i].scene.parametric_constraint_set(scope)?;
|
||||
@@ -4577,6 +4578,7 @@ properties={:.1}ms picked={}",
|
||||
canvas_sz,
|
||||
self.show_constraint_values,
|
||||
self.constraint_bar_display,
|
||||
self.constraint_bar_mode,
|
||||
p_full,
|
||||
)
|
||||
})
|
||||
@@ -6683,6 +6685,7 @@ mod selection_preview_tests {
|
||||
(800.0, 600.0),
|
||||
true,
|
||||
3,
|
||||
4095,
|
||||
)[0].1;
|
||||
let point = (-30..=30).find_map(|y| {
|
||||
(-30..=30).find_map(|x| {
|
||||
|
||||
Reference in new issue
Block a user