Skip to content

Add ShapeStyle support #161

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
Kyle-Ye merged 15 commits into from
Nov 24, 2024
Merged

Add ShapeStyle support #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c3c4343
Add _ShapeStyle_Shape and _ShapeStyle_Name
Kyle-Ye Nov 23, 2024
caf0ae8
Add ShapeStyleResolver
Kyle-Ye Nov 23, 2024
1282dfe
Update ShapeStyle implementation
Kyle-Ye Nov 23, 2024
0aaa0be
Update openswiftui_swiftinterface.sh
Kyle-Ye Nov 23, 2024
f7f5536
Add ContentStyle
Kyle-Ye Nov 23, 2024
a751ae3
Add ForegroundStyle and HierarchicalShapeStyle
Kyle-Ye Nov 23, 2024
694966f
Add basic background style support
Kyle-Ye Nov 23, 2024
4c65421
Add _ImplicitShapeStyle implementation
Kyle-Ye Nov 23, 2024
dbbbecb
Add OffsetShapeStyle implementation
Kyle-Ye Nov 23, 2024
28f1a46
Add BlendMode implementation
Kyle-Ye Nov 23, 2024
0b62e9d
Add ForegroundStyleModifier
Kyle-Ye Nov 23, 2024
b966a43
Add _ShapeStyle_RenderedShape
Kyle-Ye Nov 23, 2024
cc55582
Add ShapeStylePack
Kyle-Ye Nov 24, 2024
f2c9c27
Update file location
Kyle-Ye Nov 24, 2024
716ee40
Fix compile warning
Kyle-Ye Nov 24, 2024
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
2 changes: 1 addition & 1 deletion Scripts/openswiftui_swiftinterface.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ OPENSWIFTUI_ROOT="$(dirname $(dirname $(filepath $0)))"

cd $OPENSWIFTUI_ROOT

swift build -Xswiftc -emit-module-interface -Xswiftc -enable-library-evolution
swift build -Xswiftc -emit-module-interface -Xswiftc -enable-library-evolution -Xswiftc -no-verify-emitted-module-interface
4 changes: 0 additions & 4 deletions Sources/OpenSwiftUICore/Data/Environment/EnvironmentKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ public protocol EnvironmentKey {

static var defaultValue: Value { get }

#if OPENSWIFTUI_SUPPORT_2022_API
static func _valuesEqual(_ lhs: Self.Value, _ rhs: Self.Value) -> Bool
#endif
}

#if OPENSWIFTUI_SUPPORT_2022_API
extension EnvironmentKey {
public static func _valuesEqual(_ lhs: Self.Value, _ rhs: Self.Value) -> Bool {
compareValues(lhs, rhs)
Expand All @@ -29,7 +26,6 @@ extension EnvironmentKey where Value: Equatable {
lhs == rhs
}
}
#endif

package protocol DerivedEnvironmentKey {
associatedtype Value: Equatable
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenSwiftUICore/EventHandling/InputEvent/HitTesting/ContentResponder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// Audited for iOS 15.5
// Status: WIP

import Foundation
package import Foundation
import OpenSwiftUI_SPI

protocol ContentResponder {
package protocol ContentResponder {
func contains(points: [CGPoint], size: CGSize) -> BitVector64
func contentPath(size: CGSize) -> Path
func contentPath(size: CGSize, kind: ContentShapeKinds) -> Path
Expand Down
3 changes: 0 additions & 3 deletions ...iftUICore/Render/ColorRenderingMode.swift → ...re/Graphic/Color/ColorRenderingMode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ public enum ColorRenderingMode: Sendable {
case extendedLinear
}

extension ColorRenderingMode: Equatable {}
extension ColorRenderingMode: Hashable {}

extension ColorRenderingMode: ProtobufEnum {
package var protobufValue: UInt {
switch self {
Expand Down
Loading
Loading