Post-rebase fixes

Author: bbrk24

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -194,7 +194,7 @@ public protocol AppBackend: Sendable {
     /// A default implementation is provided. It uses the backend's reported
     /// device class and looks up the text style in a lookup table derived
     /// from Apple's typography guidelines. See ``TextStyle/resolve(for:)``.
-    @Sendable func resolveTextStyle(_ textStyle: Font.TextStyle) -> Font.TextStyle.Resolved
+    func resolveTextStyle(_ textStyle: Font.TextStyle) -> Font.TextStyle.Resolved
 
     /// Computes a window's environment based off the root environment. This may involve
     /// updating ``EnvironmentValues/windowScaleFactor`` etc.
@@ -684,7 +684,6 @@ public protocol AppBackend: Sendable {
 }
 
 extension AppBackend {
-    @Sendable
     public func resolveTextStyle(
         _ textStyle: Font.TextStyle
     ) -> Font.TextStyle.Resolved {

Sources/SwiftCrossUI/Environment/EnvironmentValues.swift

@@ -27,17 +27,19 @@ public struct EnvironmentValues {
     /// A font resolution context derived from the current environment.
     ///
     /// Essentially just a subset of the environment.
+    @MainActor
     public var fontResolutionContext: Font.Context {
         Font.Context(
             overlay: fontOverlay,
             deviceClass: backend.deviceClass,
-            resolveTextStyle: backend.resolveTextStyle(_:)
+            resolveTextStyle: { backend.resolveTextStyle($0) }
         )
     }
 
     /// The current font resolved to a form suitable for rendering. Just a
     /// helper method for our own backends. We haven't made this public because
     /// it would be weird to have two pretty equivalent ways of resolving fonts.
+    @MainActor
     package var resolvedFont: Font.Resolved {
         font.resolve(in: fontResolutionContext)
     }

Sources/SwiftCrossUI/Values/Font.swift

@@ -217,9 +217,10 @@ public struct Font: Hashable, Sendable {
     public struct Context: Sendable {
         var overlay: Font.Overlay
         var deviceClass: DeviceClass
-        var resolveTextStyle: @Sendable (TextStyle) -> TextStyle.Resolved
+        var resolveTextStyle: @MainActor @Sendable (TextStyle) -> TextStyle.Resolved
     }
 
+    @MainActor
     package func resolve(in context: Context) -> Resolved {
         let emphasizedWeight: Weight
         var resolved: Resolved

Sources/SwiftCrossUI/Values/TextStyle.swift

@@ -28,7 +28,7 @@ extension Font {
 
 extension Font.TextStyle {
     /// A text style's resolved properties.
-    public struct Resolved {
+    public struct Resolved: Sendable {
         public var pointSize: Double
         public var weight: Font.Weight = .regular
         public var emphasizedWeight: Font.Weight

Sources/SwiftCrossUI/Views/Toggle.swift

@@ -39,7 +39,7 @@ public struct Toggle: View {
 }
 
 /// A style of toggle.
-public struct ToggleStyle {
+public struct ToggleStyle: Sendable {
     package var style: Style
 
     /// A toggle switch.