fix: respect optimize_epd

flxzt · Dec 3, 2024 · 90b483e · 90b483e
1 parent 708a51c
commit 90b483e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/crates/rnote-engine/src/engine/mod.rs b/crates/rnote-engine/src/engine/mod.rs
@@ -930,8 +930,8 @@ impl Engine {
     /// Handle a requested animation frame.
     ///
     /// Can request another frame using `ÈngineViewMut#animation.claim_frame()`.
-    pub fn handle_animation_frame(&mut self) {
+    pub fn handle_animation_frame(&mut self, optimize_epd: bool) {
         self.penholder
-            .handle_animation_frame(&mut engine_view_mut!(self));
+            .handle_animation_frame(&mut engine_view_mut!(self), optimize_epd);
     }
 }
diff --git a/crates/rnote-engine/src/pens/penbehaviour.rs b/crates/rnote-engine/src/pens/penbehaviour.rs
@@ -35,7 +35,7 @@ pub trait PenBehaviour: DrawableOnDoc {
     /// Handle a requested animation frame.
     ///
     /// Can request another frame using `ÈngineViewMut#animation.claim_frame()`.
-    fn handle_animation_frame(&mut self, _engine_view: &mut EngineViewMut) {}
+    fn handle_animation_frame(&mut self, _engine_view: &mut EngineViewMut, _optimize_epd: bool) {}
 
     /// Fetch clipboard content from the pen.
     ///

diff --git a/crates/rnote-engine/src/pens/penholder.rs b/crates/rnote-engine/src/pens/penholder.rs
@@ -264,8 +264,9 @@ impl PenHolder {
     /// Handle a requested animation frame.
     ///
     /// Can request another frame using `ÈngineViewMut#animation.claim_frame()`.
-    pub fn handle_animation_frame(&mut self, engine_view: &mut EngineViewMut) {
-        self.current_pen.handle_animation_frame(engine_view);
+    pub fn handle_animation_frame(&mut self, engine_view: &mut EngineViewMut, optimize_epd: bool) {
+        self.current_pen
+            .handle_animation_frame(engine_view, optimize_epd);
     }
 
     /// Handle a pressed shortcut key.

diff --git a/crates/rnote-ui/src/canvas/mod.rs b/crates/rnote-ui/src/canvas/mod.rs
@@ -254,8 +254,14 @@ mod imp {
                 glib::ControlFlow::Break,
                 move |_widget, _frame_clock| {
                     if canvas.engine_mut().animation.process_frame() {
-                        canvas.engine_mut().handle_animation_frame();
-                        canvas.queue_draw();
+                        let optimize_epd = canvas.engine_ref().optimize_epd();
+                        canvas.engine_mut().handle_animation_frame(optimize_epd);
+
+                        // if optimize_epd is enabled, we only redraw the canvas
+                        // when no follow-up frame has been requested (i.e. the animation is done)
+                        if !optimize_epd || !canvas.engine_ref().animation.frame_in_flight() {
+                            canvas.queue_draw();
+                        }
                     }
 
                     glib::ControlFlow::Continue