tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify calculate_image_fill argument

Browse Source
This commit is contained in:
William Casarin
2023-04-04 10:24:59 -07:00
parent 825a2f944f
commit 67041b22f4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
damus/Components/ImageCarousel.swift
View File

@@ -84,9 +84,10 @@ struct ImageCarousel: View {
} }
let img_size = img.size let img_size = img.size
let is_animated = img.kf.imageFrameCount != nil let is_animated = img.kf.imageFrameCount != nil
let geo_size = geo.size
DispatchQueue.main.async { DispatchQueue.main.async {
let fill = calculate_image_fill(geo: geo, img_size: img_size, is_animated: is_animated, maxHeight: maxHeight, minHeight: minHeight) let fill = calculate_image_fill(geo_size: geo_size, img_size: img_size, is_animated: is_animated, maxHeight: maxHeight, minHeight: minHeight)
self.previews.cache_image_meta(evid: evid, image_fill: fill) self.previews.cache_image_meta(evid: evid, image_fill: fill)
self.image_fill = fill self.image_fill = fill
@@ -130,10 +131,10 @@ struct ImageFill {
let height: CGFloat let height: CGFloat
} }
func calculate_image_fill(geo: GeometryProxy, img_size: CGSize, is_animated: Bool, maxHeight: CGFloat, minHeight: CGFloat) -> ImageFill { func calculate_image_fill(geo_size: CGSize, img_size: CGSize, is_animated: Bool, maxHeight: CGFloat, minHeight: CGFloat) -> ImageFill {
let shape = determine_image_shape(img_size) let shape = determine_image_shape(img_size)
let xfactor = geo.size.width / img_size.width let xfactor = geo_size.width / img_size.width
let scaled = img_size.height * xfactor let scaled = img_size.height * xfactor
let yfactor = maxHeight / scaled let yfactor = maxHeight / scaled
// calculate scaled image height // calculate scaled image height