Merge pull request #291 from diegostafa/fix-high-cpu-usage

Fix high cpu usage when started without images
woelper · Mar 7, 2024 · 8489e0a · 8489e0a
2 parents 83d6325 + be6f192
commit 8489e0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -1034,13 +1034,12 @@ fn drawe(app: &mut App, gfx: &mut Graphics, plugins: &mut Plugins, state: &mut O
         }
 
         if state.reset_image {
-            let draw_area = ctx.available_rect();
-            let window_size = nalgebra::Vector2::new(
-                draw_area.width().min(app.window().width() as f32),
-                draw_area.height().min(app.window().height() as f32),
-            );
-
             if let Some(current_image) = &state.current_image {
+                let draw_area = ctx.available_rect();
+                let window_size = nalgebra::Vector2::new(
+                    draw_area.width().min(app.window().width() as f32),
+                    draw_area.height().min(app.window().height() as f32),
+                );
                 let img_size = current_image.size_vec();
                 state.image_geometry.scale = (window_size.x / img_size.x)
                     .min(window_size.y / img_size.y)
@@ -1053,8 +1052,8 @@ fn drawe(app: &mut App, gfx: &mut Graphics, plugins: &mut Plugins, state: &mut O
                 state.image_geometry.offset.y += draw_area.top();
                 debug!("Image has been reset.");
                 state.reset_image = false;
+                app.window().request_frame();
             }
-            app.window().request_frame();
         }
 
         // Settings come last, as they block keyboard grab (for hotkey assigment)

diff --git a/src/ui.rs b/src/ui.rs
@@ -2047,16 +2047,14 @@ pub fn main_menu(ui: &mut Ui, state: &mut OculanteState, app: &mut App, gfx: &mu
                         .unwrap_or_default()
                 ));
             }
-        }
 
-        if !state.is_loaded {
-            if let Some(p) = &state.current_path {
+            if !state.is_loaded {
                 ui.horizontal(|ui| {
                     ui.add(egui::Spinner::default());
                     ui.label(format!("Loading {}", p.display()));
                 });
+                app.window().request_frame();
             }
-            app.window().request_frame();
         }
 
         drag_area(ui, state, app);