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

Improvement to square image displaying.

Browse Source 
Closes: #864
This commit is contained in:
mainvolume
2023-04-04 15:57:55 +02:00
committed by William Casarin
parent 1aa70efee0
commit 825a2f944f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
damus/Components/ImageCarousel.swift
View File

@@ -134,23 +134,20 @@ func calculate_image_fill(geo: GeometryProxy, img_size: CGSize, is_animated: Boo
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 yfactor = maxHeight / img_size.height let scaled = img_size.height * xfactor
let yfactor = maxHeight / scaled
// calculate scaled image height // calculate scaled image height
// set scale factor and constrain images to minimum 150 // set scale factor and constrain images to minimum 150
// and animations to scaled factor for dynamic size adjustment // and animations to scaled factor for dynamic size adjustment
switch shape { switch shape {
case .portrait: case .portrait:
let filling = yfactor <= 1.0 let filling = yfactor <= 1.0
let scaled = img_size.height * xfactor
let height = filling ? maxHeight : max(scaled, minHeight) let height = filling ? maxHeight : max(scaled, minHeight)
return ImageFill(filling: filling, height: height) return ImageFill(filling: filling, height: height)
case .square: case .square:
let filling = yfactor <= 1.0 && xfactor <= 1.0 let height = max(min(maxHeight, scaled), minHeight)
let scaled = img_size.height * xfactor return ImageFill(filling: nil, height: height)
let height = filling ? maxHeight : max(scaled, minHeight)
return ImageFill(filling: filling, height: height)
case .landscape: case .landscape:
let scaled = img_size.height * xfactor
let filling = scaled > maxHeight || xfactor < 1.0 let filling = scaled > maxHeight || xfactor < 1.0
let height = is_animated ? scaled : filling ? min(maxHeight, scaled) : max(scaled, minHeight) let height = is_animated ? scaled : filling ? min(maxHeight, scaled) : max(scaled, minHeight)
return ImageFill(filling: filling, height: height) return ImageFill(filling: filling, height: height)