second hotfix

flxzt · May 6, 2022 · c0f2a7b · c0f2a7b
1 parent 79aa0bc
commit c0f2a7b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/rnote-engine/src/store/mod.rs b/rnote-engine/src/store/mod.rs
@@ -139,6 +139,8 @@ impl StrokeStore {
 
         self.chrono_counter = store_snapshot.chrono_counter;
 
+        self.update_geometry_for_strokes(&self.keys_unordered());
+
         self.reload_tree();
         self.reload_render_components_slotmap();
     }

diff --git a/rnote-ui/src/appwindow/appwindowactions.rs b/rnote-ui/src/appwindow/appwindowactions.rs
@@ -1021,7 +1021,6 @@ impl RnoteAppWindow {
             let current_sheet_center = appwindow.canvas().current_center_on_sheet();
             adw::prelude::ActionGroupExt::activate_action(&appwindow, "zoom-to-value", Some(&new_zoom.to_variant()));
             appwindow.canvas().center_around_coord_on_sheet(current_sheet_center);
-            appwindow.canvas().update_engine_rendering();
         }));
 
         // Zoom fit to width
@@ -1035,7 +1034,6 @@ impl RnoteAppWindow {
             let current_sheet_center = appwindow.canvas().current_center_on_sheet();
             adw::prelude::ActionGroupExt::activate_action(&appwindow, "zoom-to-value", Some(&new_zoom.to_variant()));
             appwindow.canvas().center_around_coord_on_sheet(current_sheet_center);
-            appwindow.canvas().update_engine_rendering();
         }));
 
         // Zoom in
@@ -1045,7 +1043,6 @@ impl RnoteAppWindow {
             let current_sheet_center = appwindow.canvas().current_center_on_sheet();
             adw::prelude::ActionGroupExt::activate_action(&appwindow, "zoom-to-value", Some(&new_zoom.to_variant()));
             appwindow.canvas().center_around_coord_on_sheet(current_sheet_center);
-            appwindow.canvas().update_engine_rendering();
         }));
 
         // Zoom out
@@ -1055,7 +1052,6 @@ impl RnoteAppWindow {
             let current_sheet_center = appwindow.canvas().current_center_on_sheet();
             adw::prelude::ActionGroupExt::activate_action(&appwindow, "zoom-to-value", Some(&new_zoom.to_variant()));
             appwindow.canvas().center_around_coord_on_sheet(current_sheet_center);
-            appwindow.canvas().update_engine_rendering();
         }));
 
         // Zoom to value

diff --git a/rnote-ui/src/appwindow/mod.rs b/rnote-ui/src/appwindow/mod.rs
@@ -989,10 +989,8 @@ impl RnoteAppWindow {
             let new_zoom = Rc::new(Cell::new(1.0));
             let bbcenter_begin: Rc<Cell<Option<na::Vector2<f64>>>> = Rc::new(Cell::new(None));
             let adjs_begin = Rc::new(Cell::new(na::vector![0.0, 0.0]));
-            let start_viewport = Rc::new(Cell::new(AABB::new_zero()));
 
             canvas_zoom_gesture.connect_begin(clone!(
-                @strong start_viewport,
                 @strong zoom_begin,
                 @strong new_zoom,
                 @strong prev_scale,
@@ -1011,12 +1009,9 @@ impl RnoteAppWindow {
 
                     bbcenter_begin.set(canvas_zoom_gesture.bounding_box_center().map(|coords| na::vector![coords.0, coords.1]));
                     adjs_begin.set(na::vector![appwindow.canvas().hadjustment().unwrap().value(), appwindow.canvas().vadjustment().unwrap().value()]);
-
-                    start_viewport.set(appwindow.canvas().engine().borrow().camera.viewport());
             }));
 
             canvas_zoom_gesture.connect_scale_changed(clone!(
-                @strong start_viewport,
                 @strong zoom_begin,
                 @strong new_zoom,
                 @strong prev_scale,
@@ -1044,12 +1039,7 @@ impl RnoteAppWindow {
 
                         appwindow.canvas().update_camera_offset(new_adj_values);
 
-                        let viewport = appwindow.canvas().engine().borrow().camera.viewport();
-                        let image_scale = appwindow.canvas().engine().borrow().camera.image_scale();
-                        if !start_viewport.get().loosened(render::VIEWPORT_RENDER_MARGIN / image_scale).contains(&viewport) {
-                            appwindow.canvas().update_engine_rendering();
-                            start_viewport.set(viewport);
-                        }
+                        // In this touch zoom gesture we dont update the rendering until we are finished. It would be too expensive.
                     }
             }));