Skip to content

Update ViewSystem for CALayer #374

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

Merged
merged 1 commit into from
Jul 6, 2025
Merged

Update ViewSystem for CALayer #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions Sources/OpenSwiftUICore/Render/PlatformViewDefinition.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Status: Blocked by PlatformDrawable and GraphicsContext

import OpenSwiftUI_SPI
#if canImport(Darwin)
#if canImport(QuartzCore)
public import QuartzCore
#else
import Foundation
Expand Down Expand Up @@ -49,7 +49,7 @@ open class PlatformViewDefinition: @unchecked Sendable {
}
}

open class var system: PlatformViewDefinition.System { .init(base: .swiftUIView) }
open class var system: PlatformViewDefinition.System { .init(base: .caLayer) }
open class func makeView(kind: PlatformViewDefinition.ViewKind) -> AnyObject { _openSwiftUIBaseClassAbstractMethod() }
#if canImport(Darwin)
open class func makeLayerView(type: CALayer.Type, kind: PlatformViewDefinition.ViewKind) -> AnyObject { _openSwiftUIBaseClassAbstractMethod() }
Expand Down Expand Up @@ -91,6 +91,17 @@ extension DisplayList.ViewUpdater.Platform {
var definition: PlatformViewDefinition.Type {
return unsafeBitCast(rawValue & ~3, to: PlatformViewDefinition.Type.self)
}

@inline(__always)
var viewSystem: ViewSystem {
return unsafeBitCast(UInt8(rawValue & 3), to: ViewSystem.self)
}

#if canImport(QuartzCore)
package func viewLayer(_ view: AnyObject) -> CALayer {
CoreViewLayer(system: viewSystem, view: view)
}
#endif
}

extension DisplayList.GraphicsRenderer {
Expand Down
26 changes: 26 additions & 0 deletions Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/OpenSwiftUICoreView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// OpenSwiftUICoreView.h
// OpenSwiftUI_SPI
//
// Status: WIP
// Audited for 6.5.4

#ifndef OpenSwiftUICoreView_h
#define OpenSwiftUICoreView_h

#include "OpenSwiftUIBase.h"

#if OPENSWIFTUI_TARGET_OS_DARWIN

#include "OpenSwiftUIViewSystem.h"
#include <QuartzCore/QuartzCore.h>

NS_ASSUME_NONNULL_BEGIN

CALayer * OpenSwiftUICoreViewLayer(OpenSwiftUIViewSystem system, id view) OPENSWIFTUI_SWIFT_NAME(CoreViewLayer(system:view:));

NS_ASSUME_NONNULL_END

#endif /* OPENSWIFTUI_TARGET_OS_DARWIN */

#endif /* OpenSwiftUICoreView_h */
20 changes: 20 additions & 0 deletions Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/OpenSwiftUICoreView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// OpenSwiftUICoreView.m
// OpenSwiftUI_SPI
//
// Status: WIP
// Audited for 6.5.4

#import "OpenSwiftUICoreView.h"

#if OPENSWIFTUI_TARGET_OS_DARWIN

CALayer * OpenSwiftUICoreViewLayer(OpenSwiftUIViewSystem system, id view) {
if (system == OpenSwiftUIViewSystemCALayer) {
return view;
} else {
return [view layer];
}
}

#endif /* OPENSWIFTUI_TARGET_OS_DARWIN */
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/OpenSwiftUIViewSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
typedef OPENSWIFTUI_ENUM(uint8_t, OpenSwiftUIViewSystem) {
OpenSwiftUIViewSystemUIView,
OpenSwiftUIViewSystemNSView,
OpenSwiftUIViewSystemSwiftUIView,
OpenSwiftUIViewSystemCALayer,
} OPENSWIFTUI_SWIFT_NAME(ViewSystem);

#endif /* OpenSwiftUIViewSystem_h */