berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(egui/MenuBar): temporarily comment out all partial conditional enabled UIs 

This is workaround for https://github.com/emilk/egui/issues/4774
(and can be reverted once that bug is fixed).

Here, we comment out all `ui.add_enabled_ui(..., |ui| ...);` wrappers
which don't cover whole menus (the bug above should only affect menus
in which only some items are disabled).
This commit is contained in:
Alain Emilia Anna Zscheile 2024-10-09 19:26:45 +02:00
parent ae66a35b8f
commit 911c974cfc
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/bin/topola-egui/menu_bar.rs
View File

@ -136,14 +136,14 @@ impl MenuBar {
egui::menu::bar(ui, |ui| { egui::menu::bar(ui, |ui| {
ui.menu_button(tr.text("tr-menu-file"), |ui| { ui.menu_button(tr.text("tr-menu-file"), |ui| {
open_design.button(ctx, ui); open_design.button(ctx, ui);
ui.add_enabled_ui(maybe_workspace.is_some(), |ui| { //ui.add_enabled_ui(maybe_workspace.is_some(), |ui| {
export_session.button(ctx, ui); export_session.button(ctx, ui);
ui.separator(); ui.separator();
import_history.button(ctx, ui); import_history.button(ctx, ui);
export_history.button(ctx, ui); export_history.button(ctx, ui);
}); //});
ui.separator(); ui.separator();
@ -164,9 +164,9 @@ impl MenuBar {
ui.separator(); ui.separator();
ui.add_enabled_ui(workspace_activities_enabled, |ui| { //ui.add_enabled_ui(workspace_activities_enabled, |ui| {
remove_bands.button(ctx, ui); remove_bands.button(ctx, ui);
}); //});
}); });
}); });
@ -178,31 +178,28 @@ impl MenuBar {
ui.separator(); ui.separator();
ui.add_enabled_ui(maybe_workspace.is_some(), |ui| { //ui.add_enabled_ui(maybe_workspace.is_some(), |ui| {
ui.checkbox( ui.checkbox(
&mut self.show_ratsnest, &mut self.show_ratsnest,
tr.text("tr-menu-view-show-ratsnest"), tr.text("tr-menu-view-show-ratsnest"),
); );
ui.checkbox( ui.checkbox(&mut self.show_navmesh, tr.text("tr-menu-view-show-navmesh"));
&mut self.show_navmesh, ui.checkbox(&mut self.show_bboxes, tr.text("tr-menu-view-show-bboxes"));
tr.text("tr-menu-view-show-navmesh"), ui.checkbox(
); &mut self.show_origin_destination,
ui.checkbox(&mut self.show_bboxes, tr.text("tr-menu-view-show-bboxes")); tr.text("tr-menu-view-show-origin-destination"),
ui.checkbox( );
&mut self.show_origin_destination,
tr.text("tr-menu-view-show-origin-destination"),
);
ui.separator();
ui.checkbox(
&mut self.show_layer_manager,
tr.text("tr-menu-view-show-layer-manager"),
);
});
ui.separator(); ui.separator();
ui.checkbox(
&mut self.show_layer_manager,
tr.text("tr-menu-view-show-layer-manager"),
);
ui.separator();
//});
ui.label(tr.text("tr-menu-view-frame-timestep")); ui.label(tr.text("tr-menu-view-frame-timestep"));
ui.add( ui.add(
egui::widgets::Slider::new(&mut self.frame_timestep, 0.0..=3.0) egui::widgets::Slider::new(&mut self.frame_timestep, 0.0..=3.0)
@ -223,9 +220,9 @@ impl MenuBar {
ui.menu_button(tr.text("tr-menu-route"), |ui| { ui.menu_button(tr.text("tr-menu-route"), |ui| {
ui.add_enabled_ui(maybe_workspace.is_some(), |ui| { ui.add_enabled_ui(maybe_workspace.is_some(), |ui| {
ui.add_enabled_ui(workspace_activities_enabled, |ui| { //ui.add_enabled_ui(workspace_activities_enabled, |ui| {
autoroute.button(ctx, ui); autoroute.button(ctx, ui);
}); //});
ui.separator(); ui.separator();
ui.menu_button(tr.text("tr-menu-options"), |ui| { ui.menu_button(tr.text("tr-menu-options"), |ui| {