refactor add_tab

Author: ranfdev

src/tab.rs

@@ -190,7 +190,7 @@ impl Tab {
         imp.req_handle
             .replace(Some(glibctx().spawn_local_with_handle(fut).unwrap()));
     }
-    pub fn spawn_open(&self, url: Url) {
+    pub fn spawn_open_url(&self, url: Url) {
         let imp = self.imp();
 
         self.emit_by_name_with_values("progress-changed", &[0.0.to_value()]);
@@ -208,7 +208,7 @@ impl Tab {
 
         let this = self.clone();
         let fut = async move {
-            match Self::open_url(&mut req_ctx).await {
+            match Self::spawn_request(&mut req_ctx).await {
                 Ok(Some(cache)) => {
                     this.add_cache(cache);
                     info!("Page loaded and cached ({})", url.clone());
@@ -231,7 +231,7 @@ impl Tab {
         let HistoryItem { url, cache, .. } = item;
         match cache {
             Some(cache) => self.spawn_open_cached(url, cache),
-            None => self.spawn_open(url),
+            None => self.spawn_open_url(url),
         }
     }
     fn spawn_open_cached(&self, url: Url, cache: Vec<u8>) {
@@ -292,7 +292,7 @@ impl Tab {
         }
         let link = Self::extract_linkhandler(draw_ctx.as_ref().unwrap(), x, y)?;
         let url = self.parse_link(&link)?;
-        self.spawn_open(url);
+        self.spawn_open_url(url);
         Ok(())
     }
     /* FIXME: fn extend_textview_menu(menu: &gtk::Menu, url: String, sender: flume::Sender<TabMsg>) {
@@ -369,7 +369,7 @@ impl Tab {
         }
         Ok(())
     }
-    async fn open_url(req: &mut RequestCtx) -> Result<Option<Vec<u8>>> {
+    async fn spawn_request(req: &mut RequestCtx) -> Result<Option<Vec<u8>>> {
         req.draw_ctx.clear();
         match req.url.scheme() {
             "about" => {

src/window.rs

@@ -98,15 +98,14 @@ impl Window {
 
         this.bind_signals();
         this.setup_actions();
-        this.add_tab();
-        this.open_url(bookmarks_url());
+        this.open_in_new_tab(bookmarks_url().as_str());
         this
     }
 
     fn setup_actions(&self) {
         self_action!(self, "back", back);
-        self_action!(self, "new-tab", add_tab);
-        self_action!(self, "show-bookmarks", add_tab);
+        self_action!(self, "new-tab", add_tab_focused);
+        self_action!(self, "show-bookmarks", add_tab_focused);
         self_action!(self, "bookmark-current", bookmark_current);
         self_action!(self, "close-tab", close_tab);
         self_action!(self, "focus-url-bar", focus_url_bar);
@@ -137,7 +136,7 @@ impl Window {
         );
         self.add_action(&act_set_clipboard);
     }
-    fn add_tab(&self) {
+    fn add_tab(&self) -> adw::TabPage {
         let imp = self.imp();
         let tab = Tab::new(imp.config.borrow().clone());
         let tab_view = imp.tab_view.clone();
@@ -164,9 +163,13 @@ impl Window {
             }),
         );
 
-        let w = imp.tab_view.append(&tab);
-        imp.tab_view.set_selected_page(&w);
-        self.open_url(bookmarks_url());
+        imp.tab_view.append(&tab)
+    }
+    fn add_tab_focused(&self) {
+        let imp = self.imp();
+        let p = self.add_tab();
+        self.inner_tab(&p).spawn_open_url(bookmarks_url());
+        imp.tab_view.set_selected_page(&p);
     }
     fn close_tab(&self) {
         let imp = self.imp();
@@ -228,7 +231,7 @@ impl Window {
         imp.progress_animation.replace(Some(animation));
     }
     fn open_url(&self, url: Url) {
-        self.current_tab().spawn_open(url);
+        self.current_tab().spawn_open_url(url);
     }
     fn back(&self) {
         match self.current_tab().back() {
@@ -262,12 +265,23 @@ impl Window {
         }
     }
     fn open_in_new_tab(&self, v: &str) {
-        self.add_tab();
-        self.open_url_str(v);
+        let w = self.add_tab();
+        let url = Url::parse(v);
+        match url {
+            Ok(url) => self.inner_tab(&w).spawn_open_url(url),
+            Err(e) => error!("Failed to parse url: {:?}", e),
+        }
     }
     fn set_clipboard(&self, v: &str) {
         gdk::Display::default().unwrap().clipboard().set_text(v);
     }
+    fn tab_page(&self, tab: &Tab) -> adw::TabPage {
+        let imp = self.imp();
+        imp.tab_view.page(tab)
+    }
+    fn inner_tab(&self, tab: &adw::TabPage) -> Tab {
+        tab.child().downcast().unwrap()
+    }
     //TODO: Reintroduce colors
     //fn set_special_color_from_hash(&self, hash: u64) {
     //    let color1 = Color(