fix per 3e8a499

Author: Bush2021

src/tabbookmark.cc

@@ -43,26 +43,6 @@ bool IsNeedKeep(int tab_count, KeepTabTrigger trigger) {
   return keep_tab;
 }
 
-bool IsFullScreen(HWND hwnd) {
-  RECT window_rect;
-  if (!GetWindowRect(hwnd, &window_rect)) {
-    return false;
-  }
-  HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-  if (!monitor) {
-    return false;
-  }
-  MONITORINFO mi = {sizeof(mi)};
-  if (!GetMonitorInfoW(monitor, &mi)) {
-    return false;
-  }
-  const bool is_full_screen = (window_rect.left == mi.rcMonitor.left &&
-                               window_rect.top == mi.rcMonitor.top &&
-                               window_rect.right == mi.rcMonitor.right &&
-                               window_rect.bottom == mi.rcMonitor.bottom);
-  return is_full_screen;
-}
-
 // When `top_container_view` is not found, the find-in-page bar may be open
 // and focused. Use `IsOnFindBarPane` to check if the click occurred on the
 // bar. If so, return nullptr to avoid interfering with find operations
@@ -340,11 +320,16 @@ bool HandleKeepTab(WPARAM wParam) {
     return false;
   }
 
-  // TODO: fix pop-up cannot be closed
   HWND hwnd = GetForegroundWindow();
   const auto tab_count = FindTabCount(hwnd);
-  if (tab_count.has_value() &&
-      !IsNeedKeep(tab_count.value(), KeepTabTrigger::kKeyboardShortcut)) {
+
+  if (!tab_count.has_value()) {
+    return false;
+  }
+
+  const bool need_keep =
+      IsNeedKeep(tab_count.value(), KeepTabTrigger::kKeyboardShortcut);
+  if (!need_keep) {
     return false;
   }
 

src/uia.cc

@@ -278,32 +278,23 @@ std::optional<int> CountClassInSubtreeRaw(
   return count;
 }
 
-std::optional<TabContainer> FindTabContainerFromHwnd(
-    const ComPtr<IUIAutomation>& automation,
-    HWND hwnd) {
-  auto root = GetElementFromHandle(automation, hwnd);
-  if (!root) {
-    return std::nullopt;
-  }
-
-  if (auto c = FindFirstInSubtree(
-          root, CreateClassCondition(automation, L"TabContainerImpl")))
-    return TabContainer{c, L"Tab"};
-  if (auto c = FindFirstInSubtree(
-          root, CreateClassCondition(automation,
-                                     L"VerticalUnpinnedTabContainerView"))) {
-    return TabContainer{c, L"VerticalTabView"};
+bool IsWindowFullScreen(HWND hwnd) {
+  RECT window_rect;
+  if (!GetWindowRect(hwnd, &window_rect)) {
+    return false;
   }
-
-  if (auto c = FindFirstInSubtreeRaw(automation, root, L"TabContainerImpl")) {
-    return TabContainer{c, L"Tab"};
+  HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+  if (!monitor) {
+    return false;
   }
-  if (auto c = FindFirstInSubtreeRaw(automation, root,
-                                     L"VerticalUnpinnedTabContainerView")) {
-    return TabContainer{c, L"VerticalTabView"};
+  MONITORINFO mi = {sizeof(mi)};
+  if (!GetMonitorInfoW(monitor, &mi)) {
+    return false;
   }
-
-  return std::nullopt;
+  return window_rect.left == mi.rcMonitor.left &&
+         window_rect.top == mi.rcMonitor.top &&
+         window_rect.right == mi.rcMonitor.right &&
+         window_rect.bottom == mi.rcMonitor.bottom;
 }
 
 ComPtr<IUIAutomationElement> FindSiblingByClass(
@@ -340,6 +331,55 @@ ComPtr<IUIAutomationElement> FindSiblingByClass(
   return nullptr;
 }
 
+std::optional<TabContainer> FindTabContainerFromHwnd(
+    const ComPtr<IUIAutomation>& automation,
+    HWND hwnd) {
+  auto root = GetElementFromHandle(automation, hwnd);
+  if (!root) {
+    return std::nullopt;
+  }
+
+  if (auto tab_strip = FindFirstInSubtree(
+          root,
+          CreateClassCondition(automation, L"TabStrip::TabDragContextImpl"))) {
+    if (auto c =
+            FindSiblingByClass(automation, tab_strip, L"TabContainerImpl")) {
+      return TabContainer{c, L"Tab"};
+    }
+  }
+
+  if (auto tab_strip_region = FindFirstInSubtree(
+          root,
+          CreateClassCondition(automation, L"HorizontalTabStripRegionView"))) {
+    if (auto c = FindFirstInSubtree(
+            tab_strip_region,
+            CreateClassCondition(automation, L"TabContainerImpl"))) {
+      return TabContainer{c, L"Tab"};
+    }
+  }
+
+  if (auto c = FindFirstInSubtree(
+          root, CreateClassCondition(automation,
+                                     L"VerticalUnpinnedTabContainerView"))) {
+    return TabContainer{c, L"VerticalTabView"};
+  }
+
+  if (!IsWindowFullScreen(hwnd)) {
+    return std::nullopt;
+  }
+
+  if (auto c = FindFirstInSubtreeRaw(automation, root, L"TabContainerImpl")) {
+    return TabContainer{c, L"Tab"};
+  }
+
+  if (auto c = FindFirstInSubtreeRaw(automation, root,
+                                     L"VerticalUnpinnedTabContainerView")) {
+    return TabContainer{c, L"VerticalTabView"};
+  }
+
+  return std::nullopt;
+}
+
 ComPtr<IUIAutomationElement> FindParentByClass(
     const ComPtr<IUIAutomation>& automation,
     const ComPtr<IUIAutomationElement>& element,