renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move maxScreenScale to RSImage-Extensions. Mark IconScalerQueue as @unchecked Sendable (because it is).

Browse Source
This commit is contained in:
Brent Simmons
2024-03-23 11:45:16 -07:00
parent d2d86fc782
commit 0ecd219bae
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Sources/Core/RSImage.swift
View File

@@ -20,14 +20,6 @@ public typealias RSImage = UIImage
public extension RSImage {
#if os(macOS)
static let maxScreenScale = CGFloat(2)
#endif
#if os(iOS)
static let maxScreenScale = CGFloat(3)
#endif
/// Create a colored image from the source image using a specified color.
///
/// - Parameter color: The color with which to fill the mask image.

21
Shared/Extensions/RSImage-Extensions.swift
View File

@@ -15,15 +15,26 @@ import Core
extension RSImage {
static let maxIconSize = 48
private static let scaledMaxPixelSize: Int = {
let maxIconSize = 48
#if os(iOS)
let maxScreenScale = 3
#elseif os(macOS)
let maxScreenScale = 2
#endif
return maxIconSize * maxScreenScale
}()
static func scaledForIcon(_ data: Data, imageResultBlock: @escaping ImageResultBlock) {
IconScalerQueue.shared.scaledForIcon(data, imageResultBlock)
}
static func scaledForIcon(_ data: Data) -> RSImage? {
let scaledMaxPixelSize = Int(ceil(CGFloat(RSImage.maxIconSize) * maxScreenScale))
guard var cgImage = RSImage.scaleImage(data, maxPixelSize: scaledMaxPixelSize) else {
guard var cgImage = RSImage.scaleImage(data, maxPixelSize: Self.scaledMaxPixelSize) else {
return nil
}
@@ -38,7 +49,7 @@ extension RSImage {
// MARK: - IconScalerQueue
private class IconScalerQueue {
private final class IconScalerQueue: @unchecked Sendable {
static let shared = IconScalerQueue()