Organizing IR UI

sensorial-systems · Oct 26, 2023 · 08d7ac5 · 08d7ac5
1 parent d831d55
commit 08d7ac5
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 68 deletions.
diff --git a/ligen/ir/src/visibility.rs b/ligen/ir/src/visibility.rs
@@ -1,5 +1,7 @@
 //! Visibility enumeration.
 
+use std::fmt::Display;
+
 use crate::prelude::*;
 
 #[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize, EnumIter)]
@@ -16,3 +18,9 @@ impl Default for Visibility {
         Self::Public
     }
 }
+
+impl Display for Visibility {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
diff --git a/tools/editor/Cargo.toml b/tools/editor/Cargo.toml
@@ -16,4 +16,5 @@ ligen-parsing.workspace       = true
 ligen-cargo.workspace         = true
 ligen-python-parser.workspace = true
 egui_tiles = "0.2.0"
-stacker = "0.1.15"
+stacker = "0.1.15"
+boolinator = "2.4.0"
diff --git a/tools/editor/src/gui/ui/layout/editor/ir/menu_button.rs b/tools/editor/src/gui/ui/layout/editor/ir/menu_button.rs
diff --git a/tools/editor/src/gui/ui/layout/editor/ir/mod.rs b/tools/editor/src/gui/ui/layout/editor/ir/mod.rs
@@ -11,7 +11,6 @@ mod type_;
 mod function;
 mod object;
 mod interface;
-mod menu_button;
 
 use egui_tiles::UiResponse;
 pub use function::*;
@@ -26,7 +25,6 @@ pub use attributes::*;
 pub use project::*;
 pub use module::*;
 pub use literal::*;
-pub use menu_button::*;
 pub use interface::*;
 use ligen_ir::symbols::Symbols;
 use crate::gui::ui::List;

diff --git a/tools/editor/src/gui/ui/layout/editor/ir/module.rs b/tools/editor/src/gui/ui/layout/editor/ir/module.rs
@@ -17,13 +17,21 @@ impl Module {
 impl Widget for Module {
     type Input = ligen_ir::Module;
     fn show(&mut self, settings: &Settings, ui: &mut egui::Ui, module: &mut ligen_ir::Module) {
-        CollapsingHeader::new(format!("{} - Symbols: {}", module.identifier, module.count_symbols()))
+        let text = if settings.display.show_visibility {
+            format!("{} {}", module.visibility, module.identifier)
+        } else {
+            module.identifier.to_string()
+        };
+        let text = format!("{} - Symbols: {}", text, module.count_symbols());
+        CollapsingHeader::new(text)
             .id_source("module")
             .show(ui, |ui| {
-                ui.horizontal_top(|ui| {
-                    Visibility::new().show(settings, ui, &mut module.visibility);
-                    Identifier::new().show(settings, ui, &mut module.identifier);
-                });
+                if settings.editor.editable_fields {
+                    ui.horizontal_top(|ui| {
+                        Visibility::new().show(settings, ui, &mut module.visibility);
+                        Identifier::new().show(settings, ui, &mut module.identifier);
+                    });
+                }
                 EditableList::new(format!("Types - Symbols: {}", module.types.len()), "Add type").show(settings, ui, &mut module.types, |ui, type_| {
                     TypeDefinition::new().show(settings, ui, type_);
                 });

diff --git a/tools/editor/src/gui/ui/layout/editor/mod.rs b/tools/editor/src/gui/ui/layout/editor/mod.rs
@@ -1,3 +1,4 @@
 pub mod ir;
 pub mod settings;
-pub mod widget;
+pub mod widget;
+pub mod menu_button;
diff --git a/tools/editor/src/gui/ui/layout/editor/settings/display_settings.rs b/tools/editor/src/gui/ui/layout/editor/settings/display_settings.rs
@@ -15,6 +15,7 @@ pub struct DisplaySettings {
     pub show_identifier: bool,
     pub show_module: bool,
     pub show_project: bool,
+    pub show_symbols_count: bool,
 }
 
 impl Default for DisplaySettings {
@@ -34,6 +35,7 @@ impl Default for DisplaySettings {
             show_identifier: true,
             show_module: true,
             show_project: true,
+            show_symbols_count: true,
         }
     }
 }
@@ -59,7 +61,8 @@ impl DisplaySettings {
             ui.checkbox(&mut self.show_function, "Function");
             ui.checkbox(&mut self.show_identifier, "Identifier");
             ui.checkbox(&mut self.show_module, "Module");
-            ui.checkbox(&mut self.show_project, "Project");    
+            ui.checkbox(&mut self.show_project, "Project");
+            ui.checkbox(&mut self.show_symbols_count, "Symbols Count");
         });
     }
 }
diff --git a/tools/editor/src/gui/ui/layout/menu/mod.rs b/tools/editor/src/gui/ui/layout/menu/mod.rs
@@ -2,6 +2,8 @@ use crate::gui::ui::editor::ir;
 use crate::gui::ui::panes::Panes;
 use crate::prelude::*;
 
+use super::editor::menu_button::EditorMenuButton;
+
 pub trait MenuButton {
     fn menu_title(&self) -> String;
     fn show_button(&self, ui: &mut egui::Ui, panes: &mut Panes);
@@ -20,7 +22,7 @@ pub struct Menu {
 impl Menu {
     pub fn new() -> Self {
         let buttons: Vec<Box<dyn MenuButton>> = vec![
-            Box::new(ir::EditorMenuButton)
+            Box::new(EditorMenuButton)
         ];
         Self { buttons }
     }