chore(dep): bump egui to 0.28.1 (#113)

antbern · Jul 12, 2024 · e631260 · e631260
1 parent 603b67c
commit e631260
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 131 deletions.
diff --git a/slamrs/Cargo.lock b/slamrs/Cargo.lock
diff --git a/slamrs/Cargo.toml b/slamrs/Cargo.toml
@@ -21,7 +21,7 @@ slam = {path = "./slam"}
 
 # we only depend on `egui` since it exports the versions of
 # `eframe` and `glow` that we need.
-eframe = { version = "0.27.2", default-features = false, features = [
+eframe = { version = "0.28", default-features = false, features = [
     #"accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
     "default_fonts", # Embed the default egui fonts.
     "glow",          # Use the glow rendering backend. Alternative: "wgpu".

diff --git a/slamrs/baseui/src/editor.rs b/slamrs/baseui/src/editor.rs
@@ -58,78 +58,79 @@ nodes:
         //     .open(&mut self.open)
         //     .constrain(true)
         //     .show(ui.ctx(), |ui| {
-        ui.set_enabled(!self.confirm_open);
+        ui.add_enabled_ui(!self.confirm_open, |ui| {
+            ui.horizontal(|ui| {
+                egui::ComboBox::from_label("Preset")
+                    .selected_text(self.presets[self.selected as usize].0.to_string())
+                    .show_ui(ui, |ui| {
+                        for (i, (name, _)) in self.presets.iter().enumerate() {
+                            ui.selectable_value(&mut self.selected, i as u32, *name);
+                        }
+                    });
+                if ui.button("Load").clicked() {
+                    // TODO: replace content with any of the presets
+                    self.confirm_open = true;
+                }
+            });
 
-        ui.horizontal(|ui| {
-            egui::ComboBox::from_label("Preset")
-                .selected_text(self.presets[self.selected as usize].0.to_string())
-                .show_ui(ui, |ui| {
-                    for (i, (name, _)) in self.presets.iter().enumerate() {
-                        ui.selectable_value(&mut self.selected, i as u32, *name);
+            // show the result of trying to convert it to a valid config object
+            if let Some(parsed_config) = &self.parsed_config {
+                match parsed_config {
+                    Ok(c) => {
+                        ui.label(format!("OK ({} nodes)", c.nodes.len()));
+                    }
+                    Err(e) => {
+                        ui.label(format!("ERR:\n{}", e));
                     }
-                });
-            if ui.button("Load").clicked() {
-                // TODO: replace content with any of the presets
-                self.confirm_open = true;
-            }
-        });
-
-        // show the result of trying to convert it to a valid config object
-        if let Some(parsed_config) = &self.parsed_config {
-            match parsed_config {
-                Ok(c) => {
-                    ui.label(format!("OK ({} nodes)", c.nodes.len()));
-                }
-                Err(e) => {
-                    ui.label(format!("ERR:\n{}", e));
                 }
+            } else {
+                ui.label("Start Typing");
             }
-        } else {
-            ui.label("Start Typing");
-        }
 
-        if let Some(Ok(c)) = &self.parsed_config {
-            if ui.button("Apply").clicked() {
-                result = Some(c.to_owned());
+            if let Some(Ok(c)) = &self.parsed_config {
+                if ui.button("Apply").clicked() {
+                    result = Some(c.to_owned());
+                }
             }
-        }
 
-        if self.confirm_open {
-            egui::Window::new("Are you sure?").show(ui.ctx(), |ui| {
-                ui.label(
+            if self.confirm_open {
+                egui::Window::new("Are you sure?").show(ui.ctx(), |ui| {
+                    ui.label(
                     "Loading a preset will replace your current config. \nDo you want to continue?",
                 );
-                ui.horizontal(|ui| {
-                    if ui.button("Load").clicked() {
-                        self.source = self.presets[self.selected as usize].1.into();
-                        self.confirm_open = false;
-
-                        // also parse the loaded config
-                        self.parse_source();
-                    }
-
-                    if ui.button("Cancel").clicked() {
-                        self.confirm_open = false;
-                    }
+                    ui.horizontal(|ui| {
+                        if ui.button("Load").clicked() {
+                            self.source = self.presets[self.selected as usize].1.into();
+                            self.confirm_open = false;
+
+                            // also parse the loaded config
+                            self.parse_source();
+                        }
+
+                        if ui.button("Cancel").clicked() {
+                            self.confirm_open = false;
+                        }
+                    });
                 });
-            });
-        }
-        let response = egui::ScrollArea::vertical()
-            .id_source("source")
-            // .max_height(ui.available_height())
-            .show(ui, |ui| {
-                ui.add(
-                    egui::TextEdit::multiline(&mut self.source)
-                        .desired_width(f32::INFINITY)
-                        .code_editor(),
-                )
-            })
-            .inner;
-
-        if response.changed() {
-            self.parse_source();
-        }
+            }
+            let response = egui::ScrollArea::vertical()
+                .id_source("source")
+                // .max_height(ui.available_height())
+                .show(ui, |ui| {
+                    ui.add(
+                        egui::TextEdit::multiline(&mut self.source)
+                            .desired_width(f32::INFINITY)
+                            .code_editor(),
+                    )
+                })
+                .inner;
+
+            if response.changed() {
+                self.parse_source();
+            }
 
-        result
+            result
+        })
+        .inner
     }
 }
diff --git a/slamrs/baseui/src/main.rs b/slamrs/baseui/src/main.rs
@@ -46,7 +46,7 @@ fn main() -> Result<(), eframe::Error> {
         native_options,
         Box::new(|cc| {
             set_style(&cc.egui_ctx);
-            Box::new(baseui::App::new(cc, config))
+            Ok(Box::new(baseui::App::new(cc, config)))
         }),
     )
 }
@@ -73,7 +73,7 @@ fn main() {
                 web_options,
                 Box::new(|cc| {
                     set_style(&cc.egui_ctx);
-                    Box::new(baseui::App::new(cc, config))
+                    Ok(Box::new(baseui::App::new(cc, config)))
                 }),
             )
             .await