Merge branch 'HakanSeven12:main' into main

src/app/update/command.rs

@@ -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,
                         });

src/app/update/mod.rs

@@ -1508,8 +1508,7 @@ impl OpenCADStudio {
             Message::ClearScene => {
                 let i = self.active_tab;
                 self.push_undo_snapshot(i, "CLEAR");
-                self.tabs[i].scene.clear();
-                crate::io::linetypes::populate_document(&mut self.tabs[i].scene.document);
+                self.tabs[i].scene.reset_to_new_drawing();
                 self.tabs[i].properties = PropertiesPanel::empty();
                 let doc_layers = self.tabs[i].scene.document.layers.clone();
                 let vp_info = self.tabs[i].scene.viewport_list();

src/app/update/viewport.rs

@@ -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,
                             )
                         })
@@ -6031,24 +6033,7 @@ properties={:.1}ms picked={}",
                     if let acadrust::objects::ObjectType::Layout(l) = obj {
                         if l.name == new_name {
                             l.flags = layout_flags;
-                            l.min_limits = (0.0, 0.0);
-                            l.max_limits = (297.0, 210.0);
-                            l.min_extents = (0.0, 0.0, 0.0);
-                            l.max_extents = (297.0, 210.0, 0.0);
-                            l.paper_width = 297.0;
-                            l.paper_height = 210.0;
-                            l.plot_paper_units = 1;
-                            l.plot_scale_numerator = 1.0;
-                            l.plot_scale_denominator = 1.0;
-                            l.plot_scale_type = 16;
-                            l.plot_scale_factor = 1.0;
-                            l.plot_type = 5;
-                            l.plot_flags.use_standard_scale = true;
-                            l.plot_flags.print_lineweights = true;
-                            l.plot_flags.plot_plot_styles = !plot_style.is_empty();
-                            l.plot_flags.show_plot_styles = !plot_style.is_empty();
-                            l.plot_style_sheet = plot_style;
-                            l.paper_size = "ISO_A4_(297.00_x_210.00_MM)".into();
+                            crate::scene::apply_default_page_setup(l, &plot_style);
                             break;
                         }
                     }
@@ -6683,6 +6668,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| {