For macOS

RomanPodymov · Jan 21, 2024 · ef0ed6c · ef0ed6c
1 parent 2495acd
commit ef0ed6c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Sources/CommonAppleKit/CommonAppleKit.swift b/Sources/CommonAppleKit/CommonAppleKit.swift
@@ -241,15 +241,20 @@ public extension CAButton {
 private extension CAImage {
  func withTint(color: CAColor, newSize: CGSize? = nil) -> CAImage {
  #if canImport(AppKit)
- .init(size: size, flipped: false) { rect -> Bool in
+ .init(size: newSize ?? size, flipped: false) { rect -> Bool in
  color.set()
  rect.fill()
- self.draw(in: rect, from: .init(origin: .zero, size: self.size), operation: .destinationIn, fraction: 1.0)
+ self.draw(
+ in: .init(origin: rect.origin, size: newSize ?? rect.size),
+ from: .init(origin: .zero, size: self.size),
+ operation: .destinationIn,
+ fraction: 1.0
+ )
  return true
  }
  #elseif canImport(UIKit)
- defer { UIGraphicsEndImageContext() }
  let sizeToUse = newSize ?? size
+ defer { UIGraphicsEndImageContext() }
  UIGraphicsBeginImageContextWithOptions(sizeToUse, false, scale)
  color.set()
  withRenderingMode(.alwaysTemplate).draw(in: CGRect(origin: .zero, size: sizeToUse))