From 5255708be321edf210a3fbc899f3cee31edd61db Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Sun, 26 Jan 2025 16:51:07 +0200
Subject: [PATCH] remove extra mod

---
 src/app/browser.rs               |  4 ++--
 src/app/browser/window.rs        | 22 +++++++++++-----------
 src/app/browser/window/widget.rs | 20 --------------------
 3 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 src/app/browser/window/widget.rs

diff --git a/src/app/browser.rs b/src/app/browser.rs
index 0b597f08..9bf85f4e 100644
--- a/src/app/browser.rs
+++ b/src/app/browser.rs
@@ -35,7 +35,7 @@ impl Browser {
 
         // Init widget
         let widget = Rc::new(Widget::new(
-            &window.widget.g_box,
+            &window.g_box,
             &[
                 // action groups
                 (
@@ -59,7 +59,7 @@ impl Browser {
         // Connect events
         action.about.connect_activate({
             let window = window.clone();
-            move || About::new().present(Some(&window.widget.g_box))
+            move || About::new().present(Some(&window.g_box))
         });
 
         action.close.connect_activate({
diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs
index 770c4b8f..2309b5b4 100644
--- a/src/app/browser/window.rs
+++ b/src/app/browser/window.rs
@@ -2,24 +2,22 @@ mod action;
 mod database;
 mod header;
 pub mod tab;
-mod widget;
 
 use action::{Action, Position};
 use adw::ToolbarView;
 use header::Header;
 use sqlite::Transaction;
 use tab::Tab;
-use widget::Widget;
 
 use super::Action as BrowserAction;
 use crate::Profile;
-use gtk::glib::GString;
+use gtk::{glib::GString, prelude::BoxExt, Box, Orientation};
 use std::rc::Rc;
 
 pub struct Window {
     pub action: Rc<Action>,
     pub tab: Rc<Tab>,
-    pub widget: Rc<Widget>,
+    pub g_box: Box,
 }
 
 impl Window {
@@ -32,10 +30,16 @@ impl Window {
 
         // Init components
         let tab = Rc::new(Tab::build(profile, (browser_action, &action)));
-        let widget = Rc::new(Widget::build(
-            &ToolbarView::header((browser_action, &action), profile, &tab.widget.tab_view),
+
+        // Init widget
+        let g_box = Box::builder().orientation(Orientation::Vertical).build();
+
+        g_box.append(&ToolbarView::header(
+            (browser_action, &action),
+            profile,
             &tab.widget.tab_view,
         ));
+        g_box.append(&tab.widget.tab_view);
 
         // Init events
         action.append.connect_activate({
@@ -123,11 +127,7 @@ impl Window {
         });
 
         // Init struct
-        Self {
-            action,
-            tab,
-            widget,
-        }
+        Self { action, tab, g_box }
     }
 
     // Actions
diff --git a/src/app/browser/window/widget.rs b/src/app/browser/window/widget.rs
deleted file mode 100644
index 5b1b2bd4..00000000
--- a/src/app/browser/window/widget.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use adw::{TabView, ToolbarView};
-use gtk::{prelude::BoxExt, Box, Orientation};
-
-pub struct Widget {
-    pub g_box: Box,
-}
-
-impl Widget {
-    // Constructors
-
-    /// Build new `Self`
-    pub fn build(header: &ToolbarView, tab: &TabView) -> Self {
-        let g_box = Box::builder().orientation(Orientation::Vertical).build();
-
-        g_box.append(header);
-        g_box.append(tab);
-
-        Self { g_box }
-    }
-}