encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-08-05 19:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use deprecated egui::menu as temp workaround

Browse Source 
egui 0.32 refactored menus, and now having a
ComboBox within the menu does not work properly.
Temporarily use the deprecated menu instead.
This commit is contained in:
Luke Street 2025-08-02 13:34:10 -06:00
parent e67d5998b3
commit a015971c20
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
objdiff-gui/src/app.rs
View File

@ -660,7 +660,10 @@ impl eframe::App for App {
let side_panel_available = diff_state.current_view == View::SymbolDiff; let side_panel_available = diff_state.current_view == View::SymbolDiff;
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| { egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
egui::MenuBar::new().ui(ui, |ui| { // Temporarily use pre-egui 0.32 menu. ComboBox within menu
// is currently broken. Issue TBD
#[allow(deprecated)]
egui::menu::bar(ui, |ui| {
if ui if ui
.add_enabled( .add_enabled(
side_panel_available, side_panel_available,
@ -672,7 +675,8 @@ impl eframe::App for App {
*show_side_panel = !*show_side_panel; *show_side_panel = !*show_side_panel;
} }
ui.separator(); ui.separator();
ui.menu_button("File", |ui| { let bar_state = egui::menu::BarState::load(ui.ctx(), ui.id());
egui::menu::menu_button(ui, "File", |ui| {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if ui.button("Debug…").clicked() { if ui.button("Debug…").clicked() {
*show_debug = !*show_debug; *show_debug = !*show_debug;
@ -689,22 +693,29 @@ impl eframe::App for App {
}; };
if recent_projects.is_empty() { if recent_projects.is_empty() {
ui.add_enabled(false, egui::Button::new("Recent projects…")); ui.add_enabled(false, egui::Button::new("Recent projects…"));
} else { } else if let Some(menu_root) = bar_state.as_ref() {
ui.menu_button("Recent Projects…", |ui| { egui::menu::submenu_button(
if ui.button("Clear").clicked() { ui,
state.write().unwrap().config.recent_projects.clear(); menu_root.menu_state.clone(),
}; "Recent Projects…",
ui.separator(); |ui| {
for path in recent_projects { if ui.button("Clear").clicked() {
if ui.button(&path).clicked() { state.write().unwrap().config.recent_projects.clear();
state };
.write() ui.separator();
.unwrap() for path in recent_projects {
.set_project_dir(Utf8PlatformPathBuf::from(path)); if ui.button(&path).clicked() {
ui.close(); state
.write()
.unwrap()
.set_project_dir(Utf8PlatformPathBuf::from(path));
ui.close();
}
} }
} },
}); );
} else {
ui.add_enabled(false, egui::Button::new("Recent projects…"));
} }
if ui.button("Appearance…").clicked() { if ui.button("Appearance…").clicked() {
*show_appearance_config = !*show_appearance_config; *show_appearance_config = !*show_appearance_config;
@ -718,7 +729,7 @@ impl eframe::App for App {
ctx.send_viewport_cmd(egui::ViewportCommand::Close); ctx.send_viewport_cmd(egui::ViewportCommand::Close);
} }
}); });
ui.menu_button("Tools", |ui| { egui::menu::menu_button(ui, "Tools", |ui| {
if ui.button("Demangle…").clicked() { if ui.button("Demangle…").clicked() {
*show_demangle = !*show_demangle; *show_demangle = !*show_demangle;
ui.close(); ui.close();
@ -728,7 +739,7 @@ impl eframe::App for App {
ui.close(); ui.close();
} }
}); });
ui.menu_button("Diff Options", |ui| { egui::menu::menu_button(ui, "Diff Options", |ui| {
if ui.button("Arch Settings…").clicked() { if ui.button("Arch Settings…").clicked() {
*show_arch_config = !*show_arch_config; *show_arch_config = !*show_arch_config;
ui.close(); ui.close();