Skip to content

Fix CGAffineTransform on non-Darwin platform #5

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 4 commits into from
Oct 19, 2025
Merged

Fix CGAffineTransform on non-Darwin platform #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50a994a
Fix CGAffineTransform on non-Darwin platform
Dark-Existed Aug 30, 2025
fbd136e
Merge branch 'OpenSwiftUIProject:main' into main
Dark-Existed Oct 11, 2025
ba2cde3
Fix CGAffineTransformTests for compatibility test suite
Dark-Existed Oct 11, 2025
ad60aa3
Fix CGAffineTransform.init issue
Kyle-Ye Oct 19, 2025
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
8 changes: 3 additions & 5 deletions Sources/OpenCoreGraphics/CGAffineTransform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,15 @@ extension CGAffineTransform {
}

public func translatedBy(x tx: CGFloat, y ty: CGFloat) -> CGAffineTransform {
let t = CGAffineTransform(a: 1, b: 0, c: 0, d: 1, tx: Double(tx), ty: Double(ty))
return concatenating(t)
CGAffineTransform(a: 1, b: 0, c: 0, d: 1, tx: Double(tx), ty: Double(ty)).concatenating(self)
}

public func scaledBy(x sx: CGFloat, y sy: CGFloat) -> CGAffineTransform {
let s = CGAffineTransform(a: Double(sx), b: 0, c: 0, d: Double(sy), tx: 0, ty: 0)
return concatenating(s)
CGAffineTransform(a: Double(sx), b: 0, c: 0, d: Double(sy), tx: 0, ty: 0).concatenating(self)
}

public func rotated(by angle: CGFloat) -> CGAffineTransform {
return concatenating(CGAffineTransform(rotationAngle: angle))
CGAffineTransform(rotationAngle: angle).concatenating(self)
}

public func inverted() -> CGAffineTransform {
Expand Down
37 changes: 37 additions & 0 deletions Tests/OpenCoreGraphicsShimsTests/CGAffineTransformTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,41 @@ struct CGAffineTransformTests {
#expect(inv.tx.isApproximatelyEqual(to: singular.tx))
#expect(inv.ty.isApproximatelyEqual(to: singular.ty))
}

// MARK: - TranslateBy
@Test
func translatedBy() {
let t1 = CGAffineTransform(a: 1, b: 2, c: 3, d: 4, tx: 5, ty: 6)
let t2 = t1.translatedBy(x: 7, y: 8)
#expect(t2.a.isApproximatelyEqual(to: 1.0))
#expect(t2.b.isApproximatelyEqual(to: 2.0))
#expect(t2.c.isApproximatelyEqual(to: 3.0))
#expect(t2.d.isApproximatelyEqual(to: 4.0))
#expect(t2.tx.isApproximatelyEqual(to: 36.0))
#expect(t2.ty.isApproximatelyEqual(to: 52.0))
}

@Test
func scaledBy() {
let t1 = CGAffineTransform(a: 1, b: 2, c: 3, d: 4, tx: 5, ty: 6)
let t2 = t1.scaledBy(x: 7, y: 8)
#expect(t2.a.isApproximatelyEqual(to: 7.0))
#expect(t2.b.isApproximatelyEqual(to: 14.0))
#expect(t2.c.isApproximatelyEqual(to: 24.0))
#expect(t2.d.isApproximatelyEqual(to: 32.0))
#expect(t2.tx.isApproximatelyEqual(to: 5.0))
#expect(t2.ty.isApproximatelyEqual(to: 6.0))
}

@Test
func rotated() {
let t1 = CGAffineTransform(a: 1, b: 2, c: 3, d: 4, tx: 5, ty: 6)
let t2 = t1.rotated(by: .pi / 2)
#expect(t2.a.isApproximatelyEqual(to: 3.0))
#expect(t2.b.isApproximatelyEqual(to: 4.0))
#expect(t2.c.isApproximatelyEqual(to: -1.0))
#expect(t2.d.isApproximatelyEqual(to: -2.0))
#expect(t2.tx.isApproximatelyEqual(to: 5.0))
#expect(t2.ty.isApproximatelyEqual(to: 6.0))
}
}