feat: keep_last_tab now works when clicking the close button

Bush2021 · Bush2021 · commit 27a4fce0624a · 2025-12-29T17:35:14.000-05:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ English | [简体中文](README_CN.md)
 ## Features
 * Double-click to close tab.
 * Right-click to close tab (hold Shift to show the original menu).
-* Preserve the last tab (prevent the browser from closing when the last tab is closed; clicking the close button will not work).
+* Preserve the last tab (prevent the browser from closing when the last tab is closed).
 * Use the mouse wheel to switch tabs when hovering over the tab bar.
 * Use the mouse wheel to switch tabs when holding the right mouse button.
 * Create new tab to opens the contents entered in address bar (can be configured to open in foreground or background).
diff --git a/README_CN.md b/README_CN.md
@@ -6,7 +6,7 @@
 ## 功能
 - 双击关闭标签页。
 - 右键关闭标签页（按住 Shift 弹出原有菜单）。
-- 保留最后标签页（防止关闭最后一个标签页时关闭浏览器，点关闭按钮不行）。
+- 保留最后标签页（防止关闭最后一个标签页时关闭浏览器）。
 - 鼠标悬停标签栏时使用滚轮切换标签页。
 - 按住右键时使用滚轮切换标签页。
 - 新建标签页打开地址栏输入的内容（可配置前台或后台打开）。
diff --git a/src/chrome++.ini b/src/chrome++.ini
diff --git a/src/tabbookmark.cc b/src/tabbookmark.cc
@@ -173,6 +173,31 @@ bool HandleMiddleClick(PMOUSEHOOKSTRUCT pmouse) {
   return false;
 }
 
+bool HandleCloseButton(PMOUSEHOOKSTRUCT pmouse) {
+  if (!config.IsKeepLastTab()) {
+    return false;
+  }
+
+  POINT pt = pmouse->pt;
+  HWND hwnd = WindowFromPoint(pt);
+  NodePtr top_container_view = HandleFindBar(hwnd, pt);
+  if (!top_container_view) {
+    return false;
+  }
+
+  if (!IsOnOneTab(top_container_view, pt) ||
+      !IsOnCloseButton(top_container_view, pt)) {
+    return false;
+  }
+
+  if (!IsNeedKeep(top_container_view)) {
+    return false;
+  }
+  ExecuteCommand(IDC_NEW_TAB, hwnd);
+  ExecuteCommand(IDC_WINDOW_CLOSE_OTHER_TABS, hwnd);
+  return true;
+}
+
 // Check if mouse movement is a drag operation.
 // Since `MouseProc` hook doesn't handle any drag-related events,
 // this detection can return early to avoid interference.
@@ -254,6 +279,8 @@ LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam) {
         break;
       } else if (HandleBookmark(pmouse)) {
         handled = true;
+      } else if (HandleCloseButton(pmouse)) {
+        handled = true;
       }
       break;
     case WM_RBUTTONUP:
