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

Merge branch 'mac-release'

This commit is contained in:
Maurice Parker 2019-09-15 04:06:52 -05:00
parent 7d738baef3 dc67c9f03b
commit 90cc8ffa6f
2 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -168,57 +168,14 @@ private extension ArticleRenderer {
return permalink != preferredLink // Make date a link if it’s a different link from the title’s link return permalink != preferredLink // Make date a link if it’s a different link from the title’s link
} }
static let avatarDimension = 48
static let doubledDimension = CGFloat(avatarDimension * 2)
static func imageScaledForDisplay(image: RSImage) -> RSImage {
// Aspect fit.
#if os(macOS)
if image.size.height <= doubledDimension && image.size.width <= doubledDimension {
return image
}
let scaledImage = NSImage.init(size: NSSize(width: doubledDimension, height: doubledDimension))
scaledImage.lockFocus()
var imageRectWidth = doubledDimension
var imageRectHeight = doubledDimension
var imageRectOriginX = CGFloat(0.0)
var imageRectOriginY = CGFloat(0.0)
if image.size.width > image.size.height {
let factor: CGFloat = doubledDimension / image.size.width
imageRectHeight = image.size.height * factor
imageRectOriginY = (doubledDimension - imageRectHeight) / 2.0
}
else if image.size.height > image.size.width {
let factor: CGFloat = doubledDimension / image.size.height
imageRectWidth = image.size.width * factor
imageRectOriginX = (doubledDimension - imageRectWidth) / 2.0
}
image.draw(in: NSRect(x: imageRectOriginX, y: imageRectOriginY, width: imageRectWidth, height: imageRectHeight))
scaledImage.unlockFocus()
return scaledImage
#else //iOS
// TODO: https://github.com/brentsimmons/NetNewsWire/issues/1021
return image
#endif
}
func faviconImgTag(forFeed feed: Feed) -> String? { func faviconImgTag(forFeed feed: Feed) -> String? {
if let cachedImgTag = ArticleRenderer.faviconImgTagCache[feed] { if let cachedImgTag = ArticleRenderer.faviconImgTagCache[feed] {
return cachedImgTag return cachedImgTag
} }
if let favicon = appDelegate.faviconDownloader.favicon(for: feed) { if let favicon = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
let scaledImage = ArticleRenderer.imageScaledForDisplay(image: favicon) if let s = base64String(forImage: favicon) {
if let s = base64String(forImage: scaledImage) {
var dimension = min(favicon.size.height, CGFloat(ArticleRenderer.avatarDimension)) // Assuming square images. var dimension = min(favicon.size.height, CGFloat(ArticleRenderer.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.
if dimension >= CGFloat(ArticleRenderer.avatarDimension) * 0.8 { //Close enough to scale up. if dimension >= CGFloat(ArticleRenderer.avatarDimension) * 0.8 { //Close enough to scale up.
@ -247,8 +204,7 @@ private extension ArticleRenderer {
} }
if let icon = appDelegate.feedIconDownloader.icon(for: feed) { if let icon = appDelegate.feedIconDownloader.icon(for: feed) {
let scaledImage = ArticleRenderer.imageScaledForDisplay(image: icon) if let s = base64String(forImage: icon) {
if let s = base64String(forImage: scaledImage) {
#if os(macOS) #if os(macOS)
let imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=48 width=48 />" let imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=48 width=48 />"
#else #else
@ -263,6 +219,7 @@ private extension ArticleRenderer {
} }
func base64String(forImage image: RSImage) -> String? { func base64String(forImage image: RSImage) -> String? {
print("height: \(image.size.height) width: \(image.size.width)")
return image.dataRepresentation()?.base64EncodedString() return image.dataRepresentation()?.base64EncodedString()
} }
@ -281,6 +238,7 @@ private extension ArticleRenderer {
return nil return nil
} }
static let avatarDimension = 48
struct Avatar { struct Avatar {
let imageURL: String let imageURL: String

2
submodules/RSCore

@ -1 +1 @@
Subproject commit 6bbc375a61775b85dca181feda8a5e98331f2bb7 Subproject commit 98c050aca6e2c4f034b22c1d3d4f938893290543