Minor fixes
This commit is contained in:
parent
d619ce3a08
commit
1877ddf7e4
|
@ -96,8 +96,7 @@ private struct DynamicTypeRangeModifier: ViewModifier {
|
|||
@Environment(\.backportDynamicTypeSize) private var size
|
||||
|
||||
private var resolvedSize: Backport<Any>.DynamicTypeSize {
|
||||
print(range)
|
||||
return range.contains(size)
|
||||
range.contains(size)
|
||||
? size
|
||||
: max(range.lowerBound, min(range.upperBound, size))
|
||||
}
|
||||
|
|
|
@ -18,44 +18,44 @@ public extension Backport<Any> {
|
|||
|
||||
public extension Backport<Any>.ImageRenderer {
|
||||
var cgImage: CGImage? {
|
||||
#if os(macOS)
|
||||
#if os(macOS)
|
||||
nsImage?.cgImage(forProposedRect: nil, context: .current, hints: nil)
|
||||
#else
|
||||
#else
|
||||
uiImage?.cgImage
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
|
||||
|
||||
#if os(macOS)
|
||||
|
||||
var nsImage: NSImage? {
|
||||
NSHostingController(rootView: content).view.snapshot
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
|
||||
#else
|
||||
|
||||
var uiImage: UIImage? {
|
||||
let controller = UIHostingController(rootView: content)
|
||||
let size = controller.view.intrinsicContentSize
|
||||
controller.view.bounds = CGRect(origin: .zero, size: size)
|
||||
controller.view.backgroundColor = .clear
|
||||
|
||||
|
||||
let format = UIGraphicsImageRendererFormat(for: controller.traitCollection)
|
||||
format.opaque = isOpaque
|
||||
format.scale = scale
|
||||
|
||||
|
||||
let renderer = UIGraphicsImageRenderer(size: size, format: format)
|
||||
|
||||
|
||||
let image = renderer.image { context in
|
||||
controller.view.drawHierarchy(in: context.format.bounds, afterScreenUpdates: true)
|
||||
}
|
||||
|
||||
|
||||
image.accessibilityLabel = label
|
||||
objectWillChange.send()
|
||||
|
||||
|
||||
return image
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
#if os(iOS)
|
||||
|
|
Loading…
Reference in New Issue