FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't scale up icons anymore. It was causing a weird effect where in some visible views the source icon was larger than in other.

Browse Source
This commit is contained in:
Maurice Parker 2020-07-21 18:25:54 -05:00
parent 9d4f34bb7c
commit f7dec4cf23
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiplatform/Shared/Images/IconImageView.swift
View File

@ -39,11 +39,7 @@ struct IconImageView: View {
let newSize: CGSize
if imageSize.height == imageSize.width {
if imageSize.height >= viewSize.height * 0.75 {
newSize = CGSize(width: viewSize.width, height: viewSize.height)
} else {
newSize = CGSize(width: imageSize.width, height: imageSize.height)
}
return imageSize
} else if imageSize.height > imageSize.width {
let factor = viewSize.height / imageSize.height
let width = imageSize.width * factor

4
Multiplatform/iOS/Article/IconView.swift
View File

@ -100,10 +100,6 @@ private extension IconView {
let imageSize = image.size
let viewSize = bounds.size
if imageSize.height == imageSize.width {
if imageSize.height >= viewSize.height * 0.75 {
// Close enough to viewSize to scale up the image.
return CGRect(x: 0.0, y: 0.0, width: viewSize.width, height: viewSize.height)
}
let offset = floor((viewSize.height - imageSize.height) / 2.0)
return CGRect(x: offset, y: offset, width: imageSize.width, height: imageSize.height)
}

4
Multiplatform/macOS/Article/IconView.swift
View File

@ -107,10 +107,6 @@ private extension IconView {
let imageSize = image.size
let viewSize = bounds.size
if imageSize.height == imageSize.width {
if imageSize.height >= viewSize.height * 0.75 {
// Close enough to viewSize to scale up the image.
return NSMakeRect(0.0, 0.0, viewSize.width, viewSize.height)
}
let offset = floor((viewSize.height - imageSize.height) / 2.0)
return NSMakeRect(offset, offset, imageSize.width, imageSize.height)
}