separate modules to submodule components

src/browser/header/tray/menu/mod.rs

@@ -1,17 +1,19 @@
-use gtk::{gio, MenuButton};
+mod model;
+mod widget;
 
-pub fn new() -> MenuButton {
-    let menu = MenuButton::builder().tooltip_text("Menu").build();
-
-    let model = gio::Menu::new();
-    let model_tab = gio::Menu::new();
-
-    model_tab.append(Some("Append"), Some("win.tab_append"));
-    model.append_submenu(Some("Tab"), &model_tab);
-    model.append(Some("Debug"), Some("win.debug"));
-    model.append(Some("Quit"), Some("win.quit"));
-
-    menu.set_menu_model(Some(&model));
-
-    menu
+pub struct Menu {
+    widget: widget::Menu,
+}
+
+impl Menu {
+    pub fn new() -> Menu {
+        Self {
+            widget: widget::Menu::new(model::Menu::new().model()),
+        }
+    }
+
+    // Getters
+    pub fn widget(&self) -> &widget::Menu {
+        &self.widget
+    }
 }

src/browser/header/tray/menu/model.rs

@@ -0,0 +1,25 @@
+use gtk::gio;
+
+pub struct Menu {
+    model: gio::Menu,
+}
+
+impl Menu {
+    // Construct
+    pub fn new() -> Menu {
+        let model = gio::Menu::new();
+        let model_tab = gio::Menu::new();
+
+        model_tab.append(Some("Append"), Some("win.tab_append"));
+        model.append_submenu(Some("Tab"), &model_tab);
+        model.append(Some("Debug"), Some("win.debug"));
+        model.append(Some("Quit"), Some("win.quit"));
+
+        Self { model }
+    }
+
+    // Getters
+    pub fn model(&self) -> &gio::Menu {
+        &self.model
+    }
+}

src/browser/header/tray/menu/widget.rs

@@ -0,0 +1,21 @@
+use gtk::gio;
+
+pub struct Menu {
+    gtk: gtk::MenuButton,
+}
+
+impl Menu {
+    // Construct
+    pub fn new(model: &gio::Menu) -> Menu {
+        let gtk = gtk::MenuButton::builder().tooltip_text("Menu").build();
+
+        gtk.set_menu_model(Some(model));
+
+        Self { gtk }
+    }
+
+    // Getters
+    pub fn gtk(&self) -> &gtk::MenuButton {
+        &self.gtk
+    }
+}

src/browser/header/tray/mod.rs

@@ -1,22 +1,23 @@
 mod menu;
 mod tab;
+mod widget;
 
-use gtk::prelude::BoxExt;
-use gtk::Box;
-
-pub fn new() -> Box {
-    // Init components
-    let tab = tab::new();
-
-    // Init widget
-    let tray = Box::builder()
-        .orientation(gtk::Orientation::Horizontal)
-        .spacing(8)
-        .build();
-
-    // Compose childs
-    tray.append(&menu::new()); // @TODO
-    tray.append(tab.widget.as_ref());
-
-    tray // @TODO struct
+pub struct Tray {
+    widget: widget::Tray,
+}
+
+impl Tray {
+    pub fn new() -> Tray {
+        Self {
+            widget: widget::Tray::new(
+                menu::Menu::new().widget().gtk(),
+                tab::Tab::new().widget().gtk(),
+            ),
+        }
+    }
+
+    // Getters
+    pub fn widget(&self) -> &widget::Tray {
+        &self.widget
+    }
 }

src/browser/header/tray/tab/mod.rs

@@ -1,27 +1,27 @@
-use std::sync::Arc;
-
-use gtk::prelude::{ButtonExt, WidgetExt};
-use gtk::Button;
+mod widget;
 
 pub struct Tab {
-    pub widget: Arc<gtk::Button>,
+    pub widget: widget::Tab,
 }
 
-pub fn new() -> Tab {
-    // Init widget
-    let widget = Arc::new(
-        Button::builder()
-            .icon_name("tab-new-symbolic")
-            .tooltip_text("New tab")
-            .build(),
-    );
+impl Tab {
+    pub fn new() -> Tab {
+        // Init widget
+        let widget = widget::Tab::new();
 
-    // Init events
-    widget.connect_clicked(|this| {
-        this.activate_action("win.tab_append", None)
-            .expect("The action does not exist");
-    });
+        // Init events
+        /* @TODO
+        widget.connect_clicked(|this| {
+            this.activate_action("win.tab_append", None)
+                .expect("The action does not exist");
+        }); */
 
-    // Result
-    Tab { widget }
+        // Result
+        Self { widget }
+    }
+
+    // Getters
+    pub fn widget(&self) -> &widget::Tab {
+        &self.widget
+    }
 }

src/browser/header/tray/tab/widget.rs

@@ -0,0 +1,20 @@
+pub struct Tab {
+    gtk: gtk::Button,
+}
+
+impl Tab {
+    // Construct
+    pub fn new() -> Tab {
+        let gtk = gtk::Button::builder()
+            .icon_name("tab-new-symbolic")
+            .tooltip_text("New tab")
+            .build();
+
+        Self { gtk }
+    }
+
+    // Getters
+    pub fn gtk(&self) -> &gtk::Button {
+        &self.gtk
+    }
+}

src/browser/header/tray/widget.rs

@@ -0,0 +1,25 @@
+use gtk::prelude::BoxExt;
+
+pub struct Tray {
+    gtk: gtk::Box,
+}
+
+impl Tray {
+    // Construct
+    pub fn new(menu: &gtk::MenuButton, tab: &gtk::Button) -> Tray {
+        let gtk = gtk::Box::builder()
+            .orientation(gtk::Orientation::Horizontal)
+            .spacing(8)
+            .build();
+
+        gtk.append(menu);
+        gtk.append(tab);
+
+        Self { gtk }
+    }
+
+    // Getters
+    pub fn gtk(&self) -> &gtk::Box {
+        &self.gtk
+    }
+}