FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Draw large favicons, and use rounded corners, in the detail view when possible.

This commit is contained in:
Brent Simmons 2018-02-25 22:58:08 -08:00
parent a3778e04a2
commit d08da99a61
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Evergreen/MainWindow/Detail/ArticleRenderer.swift
View File

@ -238,9 +238,20 @@ class ArticleRenderer {
if let favicon = appDelegate.faviconDownloader.favicon(for: feed) { if let favicon = appDelegate.faviconDownloader.favicon(for: feed) {
if let s = base64String(forImage: favicon) { if let s = base64String(forImage: favicon) {
var dimension = min(favicon.size.height, 48) // Assuming square images. var dimension = min(favicon.size.height, CGFloat(avatarDimension)) // Assuming square images.
dimension = max(dimension, 16) // Some favicons say they’re < 16. Force them larger. dimension = max(dimension, 16) // Some favicons say they’re < 16. Force them larger.
let imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=\(dimension) width=\(dimension) />" if dimension >= CGFloat(avatarDimension) * 0.8 { //Close enough to scale up.
dimension = CGFloat(avatarDimension)
}
let imgTag: String
if dimension >= CGFloat(avatarDimension) {
// Use rounded corners.
imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=\(Int(dimension)) width=\(Int(dimension)) style=\"border-radius:4px\" />"
}
else {
imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=\(Int(dimension)) width=\(Int(dimension)) />"
}
ArticleRenderer.faviconImgTagCache[feed] = imgTag ArticleRenderer.faviconImgTagCache[feed] = imgTag
return imgTag return imgTag
} }