The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.
Square page corners in release builds; downloads outlive their tab
Victor059ef4b4bded
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.ymlindex 6b7b798..fff69ea 100644--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -12,7 +12,8 @@ concurrency:jobs:build:name: Build Cra.app- runs-on: macos-15+ # Same runner as release.yml, so CI builds what ships.+ runs-on: macos-26steps:- uses: actions/checkout@v7diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 9cf532a..b9f8387 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -32,7 +32,9 @@ permissions:jobs:release:name: Build, sign, notarize, publish- runs-on: macos-15+ # The SDK a release links against decides AppKit's behaviour, so build on the macOS+ # (and SDK) local builds use: macos-15's 15.5 SDK rounded the page window's corners.+ runs-on: macos-26env:CRA_VERSION: ${{ github.event.inputs.version || github.ref_name }}# The secrets context is not allowed in step `if`s, so resolve it once here.diff --git a/Sources/Cra/UI/Overlays.swift b/Sources/Cra/UI/Overlays.swiftindex b36dfdc..f0a4af2 100644--- a/Sources/Cra/UI/Overlays.swift+++ b/Sources/Cra/UI/Overlays.swift@@ -8,6 +8,9 @@ struct DownloadToast: Identifiable, Equatable {var percent: Intvar state: Intvar path: String+ var totalBytes: Int64 = -1+ /// When Chromium last reported on it (see MainWindowController.checkStalledDownloads).+ var updated = Date()}/// Overlay state shown on top of the web content: link status, find bar,@@ -100,6 +103,7 @@ final class FindBarPanel: NSPanel {struct ToastStack: View {let overlay: OverlayState+ let onDismiss: (UInt32) -> Voidvar body: some View {VStack(alignment: .trailing, spacing: 6) {ForEach(overlay.toasts) { t in@@ -114,10 +118,17 @@ struct ToastStack: View {Text(t.state == 1 ? "Downloaded" : (t.state == 2 ? "Cancelled" : "Failed")).font(.system(size: 11)).foregroundStyle(.secondary)}}+ .frame(maxWidth: .infinity, alignment: .leading)if t.state == 1 {Button("Show") { NSWorkspace.shared.activateFileViewerSelecting([URL(fileURLWithPath: t.path)]) }.controlSize(.small)}+ // Hides the toast only; the download carries on (the Library still has it).+ Button { onDismiss(t.id) } label: {+ Image(systemName: "xmark").font(.system(size: 9, weight: .semibold)).foregroundStyle(.secondary)+ .frame(width: 16, height: 16).contentShape(Rectangle())+ }+ .buttonStyle(.plain)}.padding(10).frame(width: 300)diff --git a/Sources/Cra/UI/Windows/ChromiumWindowCorners.swift b/Sources/Cra/UI/Windows/ChromiumWindowCorners.swiftindex 7638df5..2f74a3a 100644--- a/Sources/Cra/UI/Windows/ChromiumWindowCorners.swift+++ b/Sources/Cra/UI/Windows/ChromiumWindowCorners.swift@@ -38,10 +38,15 @@ enum ChromiumWindowCorners {overrideBool(cls, "bottomCornerRounded", squareValue: false)overrideFloat(cls, "_cornerRadius", squareValue: 0)overrideFloat(cls, "_getCachedWindowCornerRadius", squareValue: 0)+ // Linked against a pre-26 SDK (release builds on GitHub's macos-15 runners), macOS 26+ // ignores the queries above and masks the window with a 12 pt corner image of its own,+ // which rounded the page's top corners under the toolbar. No mask means square.+ overrideObject(cls, "_cornerMask", squareValue: nil)}private typealias BoolIMP = @convention(c) (AnyObject, Selector) -> Boolprivate typealias FloatIMP = @convention(c) (AnyObject, Selector) -> CGFloat+ private typealias ObjectIMP = @convention(c) (AnyObject, Selector) -> Unmanaged<AnyObject>?private static func overrideBool(_ cls: AnyClass, _ name: String, squareValue: Bool) {let sel = NSSelectorFromString(name)@@ -65,4 +70,15 @@ enum ChromiumWindowCorners {let imp = imp_implementationWithBlock(block)if !class_addMethod(cls, sel, imp, types) { method_setImplementation(method, imp) }}++ private static func overrideObject(_ cls: AnyClass, _ name: String, squareValue: AnyObject?) {+ let sel = NSSelectorFromString(name)+ guard let method = class_getInstanceMethod(cls, sel), let types = method_getTypeEncoding(method) else { return }+ let original = unsafeBitCast(method_getImplementation(method), to: ObjectIMP.self)+ let block: @convention(block) (AnyObject) -> Unmanaged<AnyObject>? = { obj in+ MainActor.assumeIsolated { isSquare(obj) } ? squareValue.map { Unmanaged.passUnretained($0) } : original(obj, sel)+ }+ let imp = imp_implementationWithBlock(block)+ if !class_addMethod(cls, sel, imp, types) { method_setImplementation(method, imp) }+ }}diff --git a/Sources/Cra/UI/Windows/MainWindowController.swift b/Sources/Cra/UI/Windows/MainWindowController.swiftindex 5b8bfe6..c91c925 100644--- a/Sources/Cra/UI/Windows/MainWindowController.swift+++ b/Sources/Cra/UI/Windows/MainWindowController.swift@@ -87,7 +87,7 @@ final class MainWindowController: NSWindowController, NSWindowDelegate, BrowserMtoolbar: env(AnyView(ContentToolbarView(palette: palette))),placeholder: AnyView(EmptyContentView(space: focusedSpace)),status: AnyView(StatusBubble(overlay: overlay)),- toasts: AnyView(ToastStack(overlay: overlay)),+ toasts: AnyView(ToastStack(overlay: overlay, onDismiss: { [weak self] id in self?.removeToast(id) })),find: AnyView(FindBar(overlay: overlay, onFind: { [weak self] q, fwd in self?.find(q, forward: fwd) },onClose: { [weak self] in self?.hideFindBar() })))shell.sidebarWidth = CGFloat(store.prefs.sidebarWidth)@@ -399,7 +399,8 @@ final class MainWindowController: NSWindowController, NSWindowDelegate, BrowserMfunc browserManager(download: CraDownloadInfo) {let name = (download.fullPath as NSString).lastPathComponent.isEmpty ? download.suggestedName : (download.fullPath as NSString).lastPathComponent- let toast = DownloadToast(id: download.identifier, name: name, percent: download.percent, state: download.state.rawValue, path: download.fullPath)+ let toast = DownloadToast(id: download.identifier, name: name, percent: download.percent, state: download.state.rawValue,+ path: download.fullPath, totalBytes: download.totalBytes)if let i = overlay.toasts.firstIndex(where: { $0.id == toast.id }) { overlay.toasts[i] = toast } else {overlay.toasts.append(toast)ChromeDownloadAnimation.suppress()@@ -409,21 +410,62 @@ final class MainWindowController: NSWindowController, NSWindowDelegate, BrowserMif download.state == .complete, !download.fullPath.isEmpty, finishedDownloads.insert(download.identifier).inserted {DownloadHistory.shared.add(path: download.fullPath)}- shell.toastCount = overlay.toasts.count- shell.layoutContentChildren()- layoutToastPanel()+ layoutToasts()if download.state != .inProgress {let id = toast.id- DispatchQueue.main.asyncAfter(deadline: .now() + 8) { [weak self] in- guard let self else { return }- self.overlay.toasts.removeAll { $0.id == id }- self.shell.toastCount = self.overlay.toasts.count- self.shell.layoutContentChildren()- self.layoutToastPanel()+ DispatchQueue.main.asyncAfter(deadline: .now() + 8) { [weak self] in self?.removeToast(id) }+ } else if downloadWatchdog == nil {+ downloadWatchdog = Timer.scheduledTimer(withTimeInterval: 2, repeats: true) { [weak self] _ in+ MainActor.assumeIsolated { self?.checkStalledDownloads() }}}}+ private func removeToast(_ id: UInt32) {+ guard overlay.toasts.contains(where: { $0.id == id }) else { return }+ overlay.toasts.removeAll { $0.id == id }+ layoutToasts()+ }++ private func layoutToasts() {+ shell.toastCount = overlay.toasts.count+ shell.layoutContentChildren()+ layoutToastPanel()+ }++ private var downloadWatchdog: Timer?++ /// Chromium stops reporting a download once the tab that started it is gone (the+ /// download carries on, or ends, silently), which left its toast "in progress" for+ /// good. A toast that hasn't heard from Chromium for a while reads the file instead:+ /// gone means it ended, the full size with no .crdownload beside it means it's done.+ private func checkStalledDownloads() {+ let inProgress = overlay.toasts.filter { $0.state == CraDownloadState.inProgress.rawValue }+ guard !inProgress.isEmpty else {+ downloadWatchdog?.invalidate()+ downloadWatchdog = nil+ return+ }+ let fm = FileManager.default+ for t in inProgress where !t.path.isEmpty && Date().timeIntervalSince(t.updated) > 5 {+ guard !fm.fileExists(atPath: t.path + ".crdownload") else { continue }+ let size = (try? fm.attributesOfItem(atPath: t.path))?[.size] as? Int64+ let state: CraDownloadState+ if size == nil { state = .cancelled }+ else if let size, t.totalBytes > 0, size >= t.totalBytes { state = .complete }+ else { continue }+ let info = CraDownloadInfo()+ info.identifier = t.id+ info.fullPath = t.path+ info.suggestedName = t.name+ info.totalBytes = t.totalBytes+ info.receivedBytes = size ?? 0+ info.percent = state == .complete ? 100 : t.percent+ info.state = state+ browserManager(download: info)+ }+ }+/// Arc's download animation: the file drops onto the Library button and a download/// glyph is thrown at it from the pointer (DownloadFlight). Measured on Arc 1.170: the/// file stays 30 s after the glyph lands, then fades out over 0.15 s.diff --git a/Sources/CraCEF/CraCEF.mm b/Sources/CraCEF/CraCEF.mmindex ece141b..1999cc1 100644--- a/Sources/CraCEF/CraCEF.mm+++ b/Sources/CraCEF/CraCEF.mm@@ -55,6 +55,8 @@ static NSMutableArray<CraBrowser*>* g_pendingCreation = nil;static void (^g_relaunchHandler)(NSArray<NSString*>*) = nil;static BOOL g_alreadyRunning = NO;static NSHashTable<CraBrowser*>* g_allBrowsers = nil;+/// Closed tabs whose page stays alive until its downloads end (see -[CraBrowser close]).+static NSMutableSet<CraBrowser*>* g_parkedBrowsers = nil;static void (^g_strayPageHandler)(NSString*) = nil;static NSString* NSStringFromCef(const CefString& s) {@@ -113,6 +115,7 @@ static CraClient* AsCraClient(CefClient* c) {- (void)devToolsBrowserCreated:(CefRefPtr<CefBrowser>)browser;- (void)devToolsBrowserClosed;- (void)browserClosed;+- (void)downloadUpdated:(CraDownloadInfo*)download;- (CefRefPtr<CefBrowser>)cefBrowser;- (CefRefPtr<CefClient>)cefClient;- (void)createNow;@@ -1135,7 +1138,7 @@ public:else if (item->IsCanceled()) info.state = CraDownloadStateCancelled;else if (item->IsInterrupted()) info.state = CraDownloadStateInterrupted;else info.state = CraDownloadStateInProgress;- [o.delegate browser:o didUpdateDownload:info];+ [o downloadUpdated:info];}// Focus ---------------------------------------------------------------@@ -1322,6 +1325,8 @@ class CraDevToolsObserver : public CefDevToolsMessageObserver {NSString* _pendingURL;BOOL _pendingFocus;BOOL _isPopupHost;+ NSMutableSet<NSNumber*>* _activeDownloads;+ BOOL _parked;}- (instancetype)initWithFrame:(NSRect)frame url:(NSString*)url delegate:(id<CraBrowserDelegate>)delegate {@@ -1412,10 +1417,40 @@ class CraDevToolsObserver : public CefDevToolsMessageObserver {self.isClosed = YES;self.closedByPage = !self.closeRequested && !g_quitting;[g_allBrowsers removeObject:self];+ if (_parked) {+ // Already reported closed when it was parked. Last: this may release self.+ [g_parkedBrowsers removeObject:self];+ return;+ }id<CraBrowserDelegate> d = self.delegate;[d browserDidClose:self];}+- (void)downloadUpdated:(CraDownloadInfo*)download {+ if (!_activeDownloads) _activeDownloads = [NSMutableSet set];+ if (download.state == CraDownloadStateInProgress) [_activeDownloads addObject:@(download.identifier)];+ else [_activeDownloads removeObject:@(download.identifier)];+ [self.delegate browser:self didUpdateDownload:download];+ if (_parked && _activeDownloads.count == 0 && _browser) _browser->GetHost()->CloseBrowser(true);+}++/// Hides the page and reports it closed, but keeps the browser on about:blank until its+/// downloads end: Chromium cancels a download when the browser that started it closes+/// (Chrome keeps it going), and only that browser hears how the download goes.+- (void)park {+ _parked = YES;+ if (!g_parkedBrowsers) g_parkedBrowsers = [NSMutableSet set];+ [g_parkedBrowsers addObject:self];+ [g_allBrowsers removeObject:self];+ _browser->GetHost()->SetAudioMuted(true);+ _browser->GetMainFrame()->LoadURL("about:blank");+ if (NSWindow* host = self.hostWindow) {+ [host.parentWindow removeChildWindow:host];+ [host orderOut:nil];+ }+ [self.delegate browserDidClose:self];+}+- (BOOL)hasDevTools { return _browser ? _browser->GetHost()->HasDevTools() : NO; }- (void)loadURL:(NSString*)url {@@ -1657,9 +1692,11 @@ static NSView* FindRenderWidgetHostView(NSView* root) {- (void)notifyMoveOrResizeStarted { if (_browser) _browser->GetHost()->NotifyMoveOrResizeStarted(); }- (void)close {- if (_isClosed) return;+ if (_isClosed || _parked) return;self.closeRequested = YES;- if (_browser) {+ if (_browser && _activeDownloads.count && !g_quitting) {+ [self park];+ } else if (_browser) {_browser->GetHost()->CloseBrowser(true);} else {// Never created; drop it from the pending list and report closed.@@ -1831,11 +1868,12 @@ static void MarkProfileExitedCleanly(NSString* profileDir) {g_quitting = true;if (g_strayClient) g_strayClient->CloseWindows();NSArray<CraBrowser*>* all = [g_allBrowsers allObjects];- if (all.count == 0 || g_liveBrowsers <= 0) {+ if ((all.count == 0 && g_parkedBrowsers.count == 0) || g_liveBrowsers <= 0) {CraQuitMessageLoop();return;}for (CraBrowser* b in all) [b close];+ for (CraBrowser* b in [g_parkedBrowsers allObjects]) if (CefRefPtr<CefBrowser> cef = [b cefBrowser]) cef->GetHost()->CloseBrowser(true);}+ (NSInteger)liveBrowserCount { return g_liveBrowsers; }