Skip to content

fix(SPI): three small SDK-compatibility fixes (IOSurface import, tokenizer header, UIColor init) #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cristim wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix(SPI): three small SDK-compatibility fixes (IOSurface import, tokenizer header, UIColor init) #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11efd08
fix(SPI): import the CoreFoundation string tokenizer header explicitly
cristim Nov 4, 2026
1c760d2
fix(GraphicsImage): import IOSurface and use the current Swift spelling
cristim Nov 4, 2026
b067b39
fix(SPI): type the dynamic UIKit color initializer
cristim Nov 4, 2026
9c3b75b
fix(GraphicsImage): keep IOSurfaceRef where the IOSurface module is a…
cristim Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Sources/OpenSwiftUICore/View/Image/GraphicsImage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

package import OpenCoreGraphicsShims
package import OpenRenderBoxShims
#if canImport(IOSurface)
package import IOSurface
#endif
#if canImport(CoreGraphics)
import CoreGraphics_Private
#endif
Expand All @@ -21,7 +24,11 @@ package import CoreUI
package struct GraphicsImage: Equatable, Sendable {
package enum Contents: Equatable, @unchecked Sendable {
case cgImage(CGImage)
#if canImport(IOSurface)
case ioSurface(IOSurface)

@Kyle-Ye Kyle-Ye Nov 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we need this?

#else
case ioSurface(IOSurfaceRef)
#endif
indirect case vectorGlyph(ResolvedVectorGlyph)
indirect case vectorLayer(VectorImageLayer)
indirect case color(Color.Resolved)
Expand Down
10 changes: 9 additions & 1 deletion Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/OpenSwiftUICoreColor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
#if OPENSWIFTUI_TARGET_OS_OSX
id NSColorSpaceForCGColorSpace(CGColorSpaceRef cgColorSpace);
Class NSColorSpaceClass(void);

// This path can select UIColor dynamically on macOS. AppKit headers do not
// declare UIColor's initializer, so describe it without adding it to NSColor.
@protocol OpenSwiftUIUIKitRGBAColor
- (instancetype)initWithRed:(CGFloat)red green:(CGFloat)green
blue:(CGFloat)blue alpha:(CGFloat)alpha;
@end
#endif

BOOL OpenSwiftUICoreColorPlatformColorGetComponents(OpenSwiftUICoreSystem system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha) {
Expand Down Expand Up @@ -59,7 +66,8 @@ id OpenSwiftUICorePlatformColorForRGBA(OpenSwiftUICoreSystem system, CGFloat red
id colorSpace = NSColorSpaceForCGColorSpace(CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB));
return [colorClass colorWithColorSpace:colorSpace components:(CGFloat[]){red, green, blue, alpha} count:4];
} else {
return [[colorClass alloc] initWithRed:red green:green blue:blue alpha:alpha];
return [(id<OpenSwiftUIUIKitRGBAColor>)[colorClass alloc]
initWithRed:red green:green blue:blue alpha:alpha];
}
#else
return [[colorClass alloc] initWithRed:red green:green blue:blue alpha:alpha];
Expand Down
1 change: 1 addition & 0 deletions Sources/OpenSwiftUI_SPI/Overlay/Foundation/Localization.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#if OPENSWIFTUI_TARGET_OS_DARWIN

#import <CoreFoundation/CoreFoundation.h>
#import <CoreFoundation/CFStringTokenizer.h>
#import <os/lock.h>

@interface NSBundle (OpenSwiftUILocalizationPrivate)
Expand Down