Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 0 additions & 59 deletions .github/actions/run-uitests/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/OpenSwiftUI/Animation/Timeline/TimelineView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ extension TimelineView: View, PrimitiveView, UnaryView where Content: View {
schedule: view.value[offset: { .of(&$0.schedule) }],
phase: inputs.viewPhase,
time: inputs.time,
referenceDate: inputs.base.referenceDate,
referenceDate: inputs.referenceDate,
id: id,
frameSpecifier: inputs.base.alwaysOnFrameSpecifier,
fidelity: inputs.base.updateFidelity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ package struct CachedEnvironment {
role: ShapeRole,
mode: Attribute<_ShapeStyle_ResolverMode>?
) -> Attribute<_ShapeStyle_Pack> {
_openSwiftUIUnimplementedFailure()
_openSwiftUIUnimplementedWarning()
return ViewGraph.current.intern(.defaultValue, id: .defaultValue)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@ extension GraphicsImage: ProtobufMessage {
}
package struct ResolvedShadowStyle {}

package struct StyledTextContentView: PrimitiveView {}
package struct RasterizationOptions {}
package protocol RBDisplayListContents {} // RenderBox.RBDisplayListContents
public struct PlatformDrawableOptions {}
Expand Down
33 changes: 16 additions & 17 deletions Sources/OpenSwiftUICore/Render/GeometryEffect/GeometryEffect.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,24 +136,23 @@ extension GeometryEffectProvider {
newInputs.containerPosition = zeroPoint
newInputs.size = size
var outputs = body(_Graph(), newInputs)
guard inputs.preferences.requiresDisplayList else {
return outputs
}
let identity = DisplayList.Identity()
inputs.pushIdentity(identity)
let displayList = Attribute(
GeometryEffectDisplayList<Self>(
identity: .init(),
effect: animatableEffect,
position: inputs.animatedPosition(),
size: inputs.animatedCGSize(), // Verify: Still get a new size here
layoutDirection: inputs.layoutDirection,
containerPosition: inputs.containerPosition,
content: .init(outputs.preferences.displayList),
options: .init()
if inputs.preferences.requiresDisplayList {
let identity = DisplayList.Identity()
inputs.pushIdentity(identity)
let displayList = Attribute(
GeometryEffectDisplayList<Self>(
identity: .init(),
effect: animatableEffect,
position: inputs.animatedPosition(),
size: inputs.animatedCGSize(), // Verify: Still get a new size here
layoutDirection: inputs.layoutDirection,
containerPosition: inputs.containerPosition,
content: .init(outputs.preferences.displayList),
options: .init()
)
)
)
outputs.preferences.displayList = displayList
outputs.displayList = displayList
}
return outputs
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,60 @@

extension ShapeStyle {
package typealias RenderedShape = _ShapeStyle_RenderedShape
package typealias RenderedLayers = _ShapeStyle_RenderedLayers
package typealias LayerID = _ShapeStyle_LayerID
package typealias InterpolatorGroup = _ShapeStyle_InterpolatorGroup
}

package struct _ShapeStyle_RenderedShape {
package enum Shape {
case empty
case path(Path, FillStyle)
// case text(StyledTextContentView)
// case image(GraphicsImage)
case text(StyledTextContentView)
case image(GraphicsImage)
case alphaMask(DisplayList.Item)
}
}

package struct _ShapeStyle_RenderedLayers {
}

package enum _ShapeStyle_LayerID: Equatable {
case unstyled
case styled(_ShapeStyle_Name, UInt16)
case customStyle(Swift.UInt32)
case named(String?)
}

final package class _ShapeStyle_InterpolatorGroup/*: DisplayList.InterpolatorGroup*/ {
struct Layer {
let id: ShapeStyle.LayerID

let serial: UInt32

var style: ShapeStyle.Pack.Style

var state: DisplayList.InterpolatorLayer

var isRemoved:Bool
}

var layers: [Layer] = []

var contentsScale: Float = .zero

// FIXME
var rasterizationOptions: RasterizationOptions = .init()

var serial: UInt32 = .zero

var cursor: Int32 = .zero

init() {
_openSwiftUIEmptyStub()
}
}

extension DisplayList {
struct InterpolatorLayer {}
}
86 changes: 0 additions & 86 deletions Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyledLeadView.swift

This file was deleted.

Loading
Loading