From 2117ba90255e90b3eaa845bd6c88fa137deeffc3 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Tue, 9 Jun 2026 19:26:59 +0200 Subject: [PATCH] Cleanup: drop unnecessary @MainActor for MacWindow.{title, isMacosFullscreen, is isMacosMinimized} --- Sources/AppBundle/tree/MacWindow.swift | 9 ++++----- Sources/AppBundle/tree/Window.swift | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Sources/AppBundle/tree/MacWindow.swift b/Sources/AppBundle/tree/MacWindow.swift index aef48cba..e4fddf9f 100644 --- a/Sources/AppBundle/tree/MacWindow.swift +++ b/Sources/AppBundle/tree/MacWindow.swift @@ -102,12 +102,11 @@ final class MacWindow: Window { } } - @MainActor override var title: String { get async throws { try await macApp.getAxTitle(windowId) ?? "" } } - @MainActor override var isMacosFullscreen: Bool { get async throws { try await macApp.isMacosNativeFullscreen(windowId) == true } } - @MainActor override var isMacosMinimized: Bool { get async throws { try await macApp.isMacosNativeMinimized(windowId) == true } } + override var title: String { get async throws { try await macApp.getAxTitle(windowId) ?? "" } } + override var isMacosFullscreen: Bool { get async throws { try await macApp.isMacosNativeFullscreen(windowId) == true } } + override var isMacosMinimized: Bool { get async throws { try await macApp.isMacosNativeMinimized(windowId) == true } } - @MainActor - override func nativeFocus() { + @MainActor override func nativeFocus() { macApp.nativeFocus(windowId) } diff --git a/Sources/AppBundle/tree/Window.swift b/Sources/AppBundle/tree/Window.swift index 7ea98b9c..84ec8412 100644 --- a/Sources/AppBundle/tree/Window.swift +++ b/Sources/AppBundle/tree/Window.swift @@ -35,8 +35,7 @@ open class Window: TreeNode, Hashable { var isMacosFullscreen: Bool { get async throws { false } } var isMacosMinimized: Bool { get async throws { false } } // todo replace with enum MacOsWindowNativeState { normal, fullscreen, invisible } var isHiddenInCorner: Bool { die("Not implemented") } - @MainActor - func nativeFocus() { die("Not implemented") } + @MainActor func nativeFocus() { die("Not implemented") } func getAxRect() async throws -> Rect? { die("Not implemented") } func getCenter() async throws -> CGPoint? { try await getAxRect()?.center } -- 2.51.2