reorganize widget modules

src/browser/main/tab/page/navigation/mod.rs

@@ -4,27 +4,47 @@ mod history;
 mod reload;
 mod request;
 
-mod widget;
+use gtk::prelude::BoxExt;
+use gtk::{Box, Orientation};
+
+use base::Base;
+use bookmark::Bookmark;
+use history::History;
+use reload::Reload;
+use request::Request;
 
 pub struct Navigation {
-    widget: widget::Navigation,
+    widget: Box,
 }
 
 impl Navigation {
     pub fn new() -> Navigation {
-        Self {
-            widget: widget::Navigation::new(
-                base::Base::new().widget().gtk(),
-                history::History::new().widget().gtk(),
-                reload::Reload::new().widget().gtk(),
-                request::Request::new().widget().gtk(),
-                bookmark::Bookmark::new().widget().gtk(),
-            ),
-        }
+        let base = Base::new();
+        let history = History::new();
+        let reload = Reload::new();
+        let request = Request::new();
+        let bookmark = Bookmark::new();
+
+        let widget = Box::builder()
+            .orientation(Orientation::Horizontal)
+            .spacing(8)
+            .margin_top(8)
+            .margin_start(8)
+            .margin_end(8)
+            .margin_bottom(8)
+            .build();
+
+        widget.append(base.widget());
+        widget.append(history.widget());
+        widget.append(reload.widget());
+        widget.append(request.widget());
+        widget.append(bookmark.widget());
+
+        Self { widget }
     }
 
     // Getters
-    pub fn widget(&self) -> &widget::Navigation {
+    pub fn widget(&self) -> &Box {
         &self.widget
     }
 }