fix(tab): close window when close last tab

versotile-org · Dec 18, 2024 · 4947d46 · 4947d46
1 parent f15f136
commit 4947d46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/tab.rs b/src/tab.rs
@@ -79,11 +79,6 @@ impl TabManager {
     }
     /// Close a tab.
     pub fn close_tab(&mut self, id: WebViewId) -> Result<WebView, TabManagerErr> {
-        // Skip if there's only one webview
-        if self.tab.len() == 1 {
-            return Err(TabManagerErr::RemoveLastWebView);
-        }
-
         if let Some(idx) = self.tab_id_order.iter().position(|tab_id| *tab_id == id) {
             self.tab_id_order.remove(idx);
         }

diff --git a/src/window.rs b/src/window.rs
@@ -577,7 +577,8 @@ impl Window {
             }
             (self.panel.take().map(|panel| panel.webview), false)
         } else if let Ok(webview) = self.tab_manager.close_tab(id) {
-            (Some(webview), self.panel.is_none())
+            let close_window = self.tab_manager.count() == 0 || self.panel.is_none();
+            (Some(webview), close_window)
         } else {
             (None, false)
         }