⬆️🦀 Update Rust crate egui to 0.32.0

gui/Cargo.toml

@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
 constcat = "0.6.0"
-eframe = {version = "0.31.1", default-features = false, features = [
+eframe = {version = "0.32.0", default-features = false, features = [
   "accesskit", # Make egui compatible with screen readers. NOTE: adds a lot of dependencies.
   "default_fonts", # Embed the default egui fonts.
   "persistence", # Persist some data across starts
   "wgpu", # Use the wgpu rendering backend.
   "wayland",
   "x11",
 ]}
-egui = "0.31.1"
-egui_extras = "0.31.1"
+egui = "0.32.0"
+egui_extras = "0.32.0"
 git-version = "0.3.9"
 konst = "0.3.16"
 log = "0.4"
@@ -36,7 +36,7 @@ naviz-repository = {workspace = true}
 naviz-state = {workspace = true}
 rfd = "0.15.0"
 serde = {version = "1.0", features = ["derive"]}
-wgpu = {version = "24", features = ["webgl"]}# Enable webgl-support in wgpu
+wgpu = {version = "25", features = ["webgl"]} # Enable webgl-support in wgpu
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

gui/src/aspect_panel.rs

@@ -58,23 +58,23 @@ impl AspectPanel {
             (self.left, content_size.y).into(),
         );
 
-        ui.allocate_new_ui(
+        ui.scope_builder(
             UiBuilder::new().max_rect(content_rect.translate(self.space.min.to_vec2())),
             content,
         );
-        ui.allocate_new_ui(
+        ui.scope_builder(
             UiBuilder::new().max_rect(top_rect.translate(self.space.min.to_vec2())),
             top,
         );
-        ui.allocate_new_ui(
+        ui.scope_builder(
             UiBuilder::new().max_rect(right_rect.translate(self.space.min.to_vec2())),
             right,
         );
-        ui.allocate_new_ui(
+        ui.scope_builder(
             UiBuilder::new().max_rect(bottom_rect.translate(self.space.min.to_vec2())),
             bottom,
         );
-        ui.allocate_new_ui(
+        ui.scope_builder(
             UiBuilder::new().max_rect(left_rect.translate(self.space.min.to_vec2())),
             left,
         );

gui/src/menu.rs

@@ -213,18 +213,18 @@ impl MenuBar {
 
         self.handle_clipboard(ctx, state, errors);
 
-        egui::menu::bar(ui, |ui| {
+        egui::MenuBar::new().ui(ui, |ui| {
             ui.menu_button("File", |ui| {
                 if ui.button("Open").clicked() {
                     self.choose_file(FileType::Instructions, future_helper, MenuEvent::file_open);
-                    ui.close_menu();
+                    ui.close_kind(egui::UiKind::Menu);
                 }
 
                 ui.menu_button("Import", |ui| {
                     for import_format in IMPORT_FORMATS {
                         if ui.button(import_format.name()).clicked() {
                             self.current_import_options = Some((import_format.into(), None));
-                            ui.close_menu();
+                            ui.close_kind(egui::UiKind::Menu);
                         }
                     }
                 });
@@ -237,7 +237,7 @@ impl MenuBar {
                     ui.separator();
                     if ui.button("Quit").clicked() {
                         ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-                        ui.close_menu();
+                        ui.close_kind(egui::UiKind::Menu);
                     }
                 }
             });
@@ -260,7 +260,7 @@ impl MenuBar {
             ui.menu_button("Help", |ui| {
                 if ui.button("About").clicked() {
                     self.about_open = true;
-                    ui.close_menu();
+                    ui.close_kind(egui::UiKind::Menu);
                 }
             });
         });
@@ -482,12 +482,12 @@ mod selection_menu {
         ui.menu_button(M::NAME, |ui| {
             if ui.button("Open").clicked() {
                 menu_bar.choose_file(M::FILE_TYPE, future_helper, MenuEvent::file_open);
-                ui.close_menu();
+                ui.close_kind(egui::UiKind::Menu);
             }
             #[cfg(not(target_arch = "wasm32"))]
             if ui.button("Import").clicked() {
                 menu_bar.choose_file(M::FILE_TYPE, future_helper, MenuEvent::file_import);
-                ui.close_menu();
+                ui.close_kind(egui::UiKind::Menu);
             }
 
             ui.separator();
@@ -547,7 +547,7 @@ mod selection_menu {
                                 .inner;
                             if select_button.clicked() {
                                 actions.push(Action::Set(id.to_string()));
-                                ui.close_menu();
+                                ui.close_kind(egui::UiKind::Menu);
                             }
 
                             // Render delete button
@@ -669,7 +669,7 @@ pub mod export {
                 .clicked()
             {
                 self.export_settings.show();
-                ui.close_menu();
+                ui.close_kind(egui::UiKind::Menu);
             }
         }
 

renderer/Cargo.toml

@@ -12,11 +12,11 @@ version = "0.5.1"
 [dependencies]
 bytemuck = "1.18.0"
 glam = {version = "0.30.0", features = ["bytemuck"]}
-glyphon = "0.8"
+glyphon = "0.9"
 log = "0.4.22"
-naga_oil = "0.17"
+naga_oil = "0.18"
 naviz-state = {workspace = true}
-wgpu = {version = "24", default-features = false, features = ["wgsl", "naga-ir"]}
+wgpu = {version = "25", default-features = false, features = ["wgsl", "naga-ir"]}
 
 [build-dependencies]
 ureq = "3.0.5"

renderer/src/component/primitive/text.rs

@@ -233,13 +233,9 @@ fn to_text_buffer(
     font_family: &str,
 ) -> Buffer {
     let mut text_buffer = Buffer::new(font_system, Metrics::new(font_size, 1.2 * font_size));
+    let attrs = Attrs::new().family(Family::Name(font_family));
     text_buffer.set_size(font_system, None, None);
-    text_buffer.set_text(
-        font_system,
-        text,
-        Attrs::new().family(Family::Name(font_family)),
-        Shaping::Advanced,
-    );
+    text_buffer.set_text(font_system, text, &attrs, Shaping::Advanced);
     text_buffer.shape_until_scroll(font_system, false);
     text_buffer
 }

video/Cargo.toml

@@ -12,4 +12,4 @@ version = "0.3.1"
 [dependencies]
 naviz-animator = {workspace = true}
 naviz-renderer = {workspace = true}
-wgpu = {version = "24", default-features = false}
+wgpu = {version = "25", default-features = false}

video/src/lib.rs

@@ -50,15 +50,13 @@ async fn create_device() -> (Device, Queue) {
         .await
         .expect("No adapter");
     adapter
-        .request_device(
-            &DeviceDescriptor {
-                label: Some("naviz video renderer"),
-                required_features: Features::default(),
-                required_limits: Limits::default(),
-                memory_hints: MemoryHints::default(),
-            },
-            None,
-        )
+        .request_device(&DeviceDescriptor {
+            label: Some("naviz video renderer"),
+            required_features: Features::default(),
+            required_limits: Limits::default(),
+            memory_hints: MemoryHints::default(),
+            trace: wgpu::Trace::default(),
+        })
         .await
         .expect("Failed to create device")
 }
@@ -269,7 +267,7 @@ impl VideoExport {
         buffer_slice.map_async(MapMode::Read, move |result| {
             tx.send(result).unwrap();
         });
-        self.device.poll(wgpu::MaintainBase::Wait);
+        let _ = self.device.poll(wgpu::MaintainBase::Wait);
         rx.recv().unwrap().unwrap();
 
         buffer_slice.get_mapped_range()