Update to egui 0.32 (& update all deps)

2025-12-08 21:17:59 +00:00 · 2025-07-28 17:30:52 -06:00
parent 85fb18a21a
commit c327ed3ea8
10 changed files with 255 additions and 129 deletions
--- a/objdiff-gui/Cargo.toml
+++ b/objdiff-gui/Cargo.toml
@@ -29,8 +29,8 @@ cfg-if = "1.0"
 const_format = "0.2"
 cwdemangle = "1.0"
 dirs = "6.0"
-egui = "0.31"
-egui_extras = "0.31"
+egui = "0.32"
+egui_extras = "0.32"
 filetime = "0.2"
 float-ord = "0.3"
 font-kit = "0.14"
@@ -43,18 +43,19 @@ pollster = "0.4"
 regex = "1.11"
 rfd = { version = "0.15" } #, default-features = false, features = ['xdg-portal']
 rlwinmdec = "1.1"
-ron = "0.8"
+ron = "0.10"
 serde = { version = "1.0", features = ["derive"] }
 time = { version = "0.3", features = ["formatting", "local-offset"] }
 typed-path = "0.11"
-winit = { version = "0.30", features = ["wayland-csd-adwaita"] }
+winit = { version = "0.30", features = ["default"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

 # Keep version in sync with egui
 [dependencies.eframe]
-version = "0.31"
+version = "0.32"
 features = [
    "default_fonts",
+    "glow",
    "persistence",
    "wayland",
    "x11",
@@ -63,10 +64,12 @@ default-features = false

 # Keep version in sync with eframe
 [dependencies.wgpu]
-version = "24.0"
+version = "25.0"
 features = [
    "dx12",
    "metal",
+    "gles",
+    "vulkan",
    "webgpu",
 ]
 optional = true
--- a/objdiff-gui/src/app.rs
+++ b/objdiff-gui/src/app.rs
@@ -461,7 +461,7 @@ impl App {
            use eframe::egui_wgpu::wgpu::Backend;
            let info = wgpu_render_state.adapter.get_info();
            app.view_state.graphics_state.active_backend = match info.backend {
-                Backend::Empty => "Unknown",
+                Backend::Noop => "None",
                Backend::Vulkan => "Vulkan",
                Backend::Metal => "Metal",
                Backend::Dx12 => "DirectX 12",
@@ -665,7 +665,7 @@ impl eframe::App for App {
        let side_panel_available = diff_state.current_view == View::SymbolDiff;

        egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
-            egui::menu::bar(ui, |ui| {
+            egui::MenuBar::new().ui(ui, |ui| {
                if ui
                    .add_enabled(
                        side_panel_available,
@@ -681,11 +681,11 @@ impl eframe::App for App {
                    #[cfg(debug_assertions)]
                    if ui.button("Debug…").clicked() {
                        *show_debug = !*show_debug;
-                        ui.close_menu();
+                        ui.close();
                    }
                    if ui.button("Project…").clicked() {
                        *show_project_config = !*show_project_config;
-                        ui.close_menu();
+                        ui.close();
                    }
                    let recent_projects = if let Ok(guard) = state.read() {
                        guard.config.recent_projects.clone()
@@ -706,18 +706,18 @@ impl eframe::App for App {
                                        .write()
                                        .unwrap()
                                        .set_project_dir(Utf8PlatformPathBuf::from(path));
-                                    ui.close_menu();
+                                    ui.close();
                                }
                            }
                        });
                    }
                    if ui.button("Appearance…").clicked() {
                        *show_appearance_config = !*show_appearance_config;
-                        ui.close_menu();
+                        ui.close();
                    }
                    if ui.button("Graphics…").clicked() {
                        *show_graphics = !*show_graphics;
-                        ui.close_menu();
+                        ui.close();
                    }
                    if ui.button("Quit").clicked() {
                        ctx.send_viewport_cmd(egui::ViewportCommand::Close);
@@ -726,17 +726,17 @@ impl eframe::App for App {
                ui.menu_button("Tools", |ui| {
                    if ui.button("Demangle…").clicked() {
                        *show_demangle = !*show_demangle;
-                        ui.close_menu();
+                        ui.close();
                    }
                    if ui.button("Rlwinm Decoder…").clicked() {
                        *show_rlwinm_decode = !*show_rlwinm_decode;
-                        ui.close_menu();
+                        ui.close();
                    }
                });
                ui.menu_button("Diff Options", |ui| {
                    if ui.button("Arch Settings…").clicked() {
                        *show_arch_config = !*show_arch_config;
-                        ui.close_menu();
+                        ui.close();
                    }
                    let mut state = state.write().unwrap();
                    let response = ui
--- a/objdiff-gui/src/views/config.rs
+++ b/objdiff-gui/src/views/config.rs
@@ -5,8 +5,8 @@ use std::{mem::take, path::MAIN_SEPARATOR};
 #[cfg(all(windows, feature = "wsl"))]
 use anyhow::{Context, Result};
 use egui::{
-    CollapsingHeader, FontFamily, FontId, RichText, SelectableLabel, TextFormat, Widget,
-    output::OpenUrl, text::LayoutJob,
+    CollapsingHeader, FontFamily, FontId, RichText, TextFormat, Widget, output::OpenUrl,
+    text::LayoutJob,
 };
 use globset::Glob;
 use objdiff_core::{
@@ -278,7 +278,7 @@ pub fn config_ui(
            {
                filters_text = filters_text.color(appearance.replace_color);
            }
-            egui::menu::menu_button(ui, filters_text, |ui| {
+            egui::containers::menu::MenuButton::new(filters_text).ui(ui, |ui| {
                ui.checkbox(&mut config_state.filter_diffable, "Diffable")
                    .on_hover_text_at_pointer("Only show objects with a source file");
                ui.checkbox(&mut config_state.filter_incomplete, "Incomplete")
@@ -355,7 +355,7 @@ fn display_unit(
    } else {
        appearance.text_color
    };
-    let response = SelectableLabel::new(
+    let response = egui::Button::selectable(
        selected,
        RichText::new(name)
            .font(FontId {
@@ -384,7 +384,7 @@ fn object_context_ui(ui: &mut egui::Ui, object: &ObjectConfig) {
            if let Err(e) = open::that_detached(source_path.as_str()) {
                log::error!("Failed to open source file: {e}");
            }
-            ui.close_menu();
+            ui.close();
        }
    }
 }
--- a/objdiff-gui/src/views/diff.rs
+++ b/objdiff-gui/src/views/diff.rs
@@ -873,7 +873,7 @@ pub fn context_menu_items_ui(
                }
                if ui.button(job).clicked() {
                    ui.ctx().copy_text(value);
-                    ui.close_menu();
+                    ui.close();
                }
            }
            ContextItem::Navigate { label, symbol_index, kind } => {
@@ -883,7 +883,7 @@ pub fn context_menu_items_ui(
                        symbol_index,
                        column,
                    )));
-                    ui.close_menu();
+                    ui.close();
                }
            }
            ContextItem::Separator => {
--- a/objdiff-gui/src/views/graphics.rs
+++ b/objdiff-gui/src/views/graphics.rs
@@ -54,7 +54,7 @@ pub fn load_graphics_config(path: &Path) -> Result<Option<GraphicsConfig>> {

 pub fn save_graphics_config(path: &Path, config: &GraphicsConfig) -> Result<()> {
    let file = BufWriter::new(File::create(path)?);
-    ron::ser::to_writer(file, config)?;
+    ron::Options::default().to_io_writer(file, config)?;
    Ok(())
 }

--- a/objdiff-gui/src/views/symbol_diff.rs
+++ b/objdiff-gui/src/views/symbol_diff.rs
@@ -1,8 +1,8 @@
 use std::mem::take;

 use egui::{
-    CollapsingHeader, Color32, Id, OpenUrl, ScrollArea, SelectableLabel, Ui, Widget,
-    style::ScrollAnimation, text::LayoutJob,
+    CollapsingHeader, Color32, Id, OpenUrl, ScrollArea, Ui, Widget, style::ScrollAnimation,
+    text::LayoutJob,
 };
 use objdiff_core::{
    diff::{
@@ -508,7 +508,7 @@ pub fn symbol_context_menu_ui(
                } else {
                    ret = Some(DiffViewAction::SelectingLeft(symbol_ref));
                }
-                ui.close_menu();
+                ui.close();
            }
        }
    });
@@ -586,7 +586,7 @@ fn symbol_ui(
        write_text(") ", appearance.text_color, &mut job, appearance.code_font.clone());
    }
    write_text(name, appearance.highlight_color, &mut job, appearance.code_font.clone());
-    let response = SelectableLabel::new(selected, job)
+    let response = egui::Button::selectable(selected, job)
        .ui(ui)
        .on_hover_ui_at_pointer(|ui| symbol_hover_ui(ui, ctx, symbol_idx, appearance));
    response.context_menu(|ui| {