refactor: default to ControlFlow::Wait in general

This seems to improve CPU usage, especially when not interacting with the applets after the latest updates
pop-os · Sep 26, 2023 · c337fa5 · c337fa5
1 parent 6c1706b
commit c337fa5
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/sctk/src/application.rs b/sctk/src/application.rs
@@ -1174,18 +1174,15 @@ where
                                     redraw_request: Some(redraw_request),
                                 } => {
                                     match redraw_request {
-                                    crate::core::window::RedrawRequest::NextFrame => {
-                                        ControlFlow::Poll
-                                    }
-                                    crate::core::window::RedrawRequest::At(at) => {
-                                        ControlFlow::WaitUntil(at)
+                                        crate::core::window::RedrawRequest::NextFrame => {
+                                            ControlFlow::Wait
+                                        }
+                                        crate::core::window::RedrawRequest::At(at) => {
+                                            ControlFlow::WaitUntil(at)
+                                        }
                                     }
-                                }},
-                                _ => if needs_update {
-                                    ControlFlow::Poll
-                                } else {
-                                    ControlFlow::Wait
                                 },
+                                _ => ControlFlow::Wait,
                             });
                     }
                     redraw_pending = false;
@@ -1214,6 +1211,7 @@ where
                     // NOTE Ashley: this is done here only after a redraw for now instead of the event handler.
                     // Otherwise cpu goes up in the running application as well as in cosmic-comp
                     if let Some(surface) = state.frame.take() {
+                        dbg!("frame");
                         surface.frame(&queue_handle, surface.clone());
                         surface.commit();
                     }