From a4af5d51e8fbb8a0e53f98aa9f9e238536aaba24 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 12 Jun 2026 21:08:39 +0800
Subject: [PATCH] Render split view spaces with ordered app halves
---
C1.source/Sources/AlignerCore/Windows/WindowEnumerationPolicy.swift | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/C1.source/Sources/AlignerCore/Windows/WindowEnumerationPolicy.swift b/C1.source/Sources/AlignerCore/Windows/WindowEnumerationPolicy.swift
index a219abb..16c3e0c 100644
--- a/C1.source/Sources/AlignerCore/Windows/WindowEnumerationPolicy.swift
+++ b/C1.source/Sources/AlignerCore/Windows/WindowEnumerationPolicy.swift
@@ -22,6 +22,7 @@
public let activationPolicy: AlignerActivationPolicy
public let title: String
public let size: CGSize
+ public let frame: CGRect?
public let subrole: AlignerWindowSubrole
public let isMinimized: Bool
public let isFullscreen: Bool
@@ -40,6 +41,7 @@
title: String,
identifierSource: AlignerWindow.IdentifierSource = .cgWindow,
size: CGSize,
+ frame: CGRect? = nil,
subrole: AlignerWindowSubrole,
isMinimized: Bool = false,
isFullscreen: Bool = false,
@@ -57,6 +59,7 @@
self.activationPolicy = activationPolicy
self.title = title
self.size = size
+ self.frame = frame
self.subrole = subrole
self.isMinimized = isMinimized
self.isFullscreen = isFullscreen
@@ -83,6 +86,7 @@
guard !record.isDesktopElement else { return false }
guard !record.isSystemCritical else { return false }
guard record.isInteractable else { return false }
+ guard !isKnownClosedShottrCGPlaceholder(record) else { return false }
guard !isCGOnlyOffscreenGhost(record) else { return false }
guard !isKnownClosedDocumentPlaceholder(record) else { return false }
@@ -91,7 +95,7 @@
private static func hasSupportedActivationPolicy(_ record: WindowEnumerationRecord) -> Bool {
record.activationPolicy == .regular
- || (record.activationPolicy == .accessory && isKnownCGOnlyOffscreenMainWindow(record))
+ || (record.activationPolicy == .accessory && isKnownAccessoryMainWindow(record))
}
public static func window(from record: WindowEnumerationRecord) -> AlignerWindow? {
@@ -105,6 +109,7 @@
isMinimized: record.isMinimized,
isFullscreen: record.isFullscreen,
isGhost: record.isGhost,
+ frame: record.frame,
spaceIDs: record.spaceIDs
)
}
@@ -132,6 +137,10 @@
return false
}
+ if !record.spaceIDs.isEmpty {
+ return false
+ }
+
return !isKnownCGOnlyOffscreenMainWindow(record)
}
@@ -139,8 +148,8 @@
let trimmedTitle = record.title.trimmingCharacters(in: .whitespacesAndNewlines)
switch record.app.bundleIdentifier {
- case "cc.ffitch.shottr":
- return trimmedTitle == "Shottr" && isLargeEnough(record.size)
+ case "com.apple.finder":
+ return !trimmedTitle.isEmpty && isLargeEnough(record.size)
case "io.dcloud.HBuilderX":
return !trimmedTitle.isEmpty && isLargeEnough(record.size)
default:
@@ -148,6 +157,27 @@
}
}
+ private static func isKnownAccessoryMainWindow(_ record: WindowEnumerationRecord) -> Bool {
+ let trimmedTitle = record.title.trimmingCharacters(in: .whitespacesAndNewlines)
+
+ return record.app.bundleIdentifier == "cc.ffitch.shottr"
+ && trimmedTitle == "Shottr"
+ && record.isOnscreen
+ && isLargeEnough(record.size)
+ }
+
+ private static func isKnownClosedShottrCGPlaceholder(_ record: WindowEnumerationRecord) -> Bool {
+ let trimmedTitle = record.title.trimmingCharacters(in: .whitespacesAndNewlines)
+
+ return record.app.bundleIdentifier == "cc.ffitch.shottr"
+ && trimmedTitle == "Shottr"
+ && record.identifierSource == .cgWindow
+ && !record.hasAXBacking
+ && !record.isOnscreen
+ && !record.isMinimized
+ && !record.isFullscreen
+ }
+
private static func isKnownClosedDocumentPlaceholder(_ record: WindowEnumerationRecord) -> Bool {
let trimmedTitle = record.title.trimmingCharacters(in: .whitespacesAndNewlines)
return record.identifierSource == .cgWindow
--
Gitblit v1.9.3