Anchor toasts bottom left and move load indicator

woelper · Dec 9, 2023 · da217eb · da217eb
1 parent 9f8c688
commit da217eb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/src/appstate.rs b/src/appstate.rs
@@ -146,7 +146,7 @@ impl Default for OculanteState {
             checker_texture: Default::default(),
             redraw: Default::default(),
             first_start: true,
-            toasts: Toasts::default(),
+            toasts: Toasts::default().with_anchor(egui_notify::Anchor::BottomLeft),
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
@@ -1007,21 +1007,21 @@ fn drawe(app: &mut App, gfx: &mut Graphics, plugins: &mut Plugins, state: &mut O
             edit_ui(app, ctx, state, gfx);
         }
 
-        if !state.is_loaded {
-            egui::TopBottomPanel::bottom("loader").show_animated(
-                ctx,
-                state.current_path.is_some(),
-                |ui| {
-                    if let Some(p) = &state.current_path {
-                        ui.horizontal(|ui| {
-                            ui.add(egui::Spinner::default());
-                            ui.label(format!("Loading {}", p.display()));
-                        });
-                    }
-                    app.window().request_frame();
-                },
-            );
-        }
+        // if !state.is_loaded {
+        //     egui::TopBottomPanel::bottom("loader").show_animated(
+        //         ctx,
+        //         state.current_path.is_some(),
+        //         |ui| {
+        //             if let Some(p) = &state.current_path {
+        //                 ui.horizontal(|ui| {
+        //                     ui.add(egui::Spinner::default());
+        //                     ui.label(format!("Loading {}", p.display()));
+        //                 });
+        //             }
+        //             app.window().request_frame();
+        //         },
+        //     );
+        // }
 
         state.pointer_over_ui = ctx.is_pointer_over_area();
         // info!("using pointer {}", ctx.is_using_pointer());

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