expose less of the interals of the gui to the main app

src/gui/elements.rs

@@ -1,9 +1,13 @@
 use iced::widget::{button, row};
 use iced::Element;
-use iced_aw::menu::MenuTree;
+use iced_aw::menu::{MenuBar, MenuTree};
 use iced_aw::{TabBar, TabLabel};
 
-pub fn file<'a>(_app: &super::State) -> MenuTree<'a, super::Message, iced::Renderer> {
+pub fn menu_bar<'a>() -> MenuBar<'a, super::Message, iced::Renderer> {
+ MenuBar::new(vec![file()])
+}
+
+fn file<'a>() -> MenuTree<'a, super::Message, iced::Renderer> {
  let new_file = MenuTree::new(button("New File").on_press(super::Message::TabNew(
  super::FileTab {
  text: std::string::String::default(),

src/gui/mod.rs

@@ -3,12 +3,11 @@ use std::path::PathBuf;
 use iced::widget::text_input;
 use iced::widget::Column;
 use iced::{theme, Application, Command, Element, Subscription};
-use iced_aw::menu::MenuBar;
 
 mod elements;
 mod file_dialog;
 
-pub use elements::file;
+pub use elements::menu_bar;
 
 #[derive(Debug, Clone)]
 pub enum Message {
@@ -148,9 +147,7 @@ impl Application for State {
  }
 
  fn view(&self) -> Element<Message> {
- let menu_bar = MenuBar::new(vec![file(self)]);
-
- let mut c = Column::new().push(menu_bar);
+ let mut c = Column::new().push(menu_bar());
 
  if !self.tabs.is_empty() {
  c = c.push(elements::tab_header(&self.tabs, self.active_tab.unwrap()));