FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-30 03:20:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Place avatars on the left in the timeline.

Browse Source
This commit is contained in:
Brent Simmons 2019-05-12 20:42:52 -07:00
parent 1b22abbbfc
commit 52b1ef2350
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
View File

@ -37,6 +37,7 @@ struct TimelineCellAppearance: Equatable {
let avatarSize = NSSize(width: 48, height: 48)
let avatarMarginLeft: CGFloat = 8.0
let avatarMarginRight: CGFloat = 8.0
let avatarAdjustmentTop: CGFloat = 4.0
let avatarCornerRadius: CGFloat = 4.0

19
Mac/MainWindow/Timeline/Cell/TimelineCellLayout.swift
View File

@ -50,7 +50,7 @@ struct TimelineCellLayout {
// If height == 0.0, then height is calculated.
let showAvatar = hasAvatar && cellData.showAvatar
let showAvatar = cellData.showAvatar
var textBoxRect = TimelineCellLayout.rectForTextBox(appearance, cellData, showAvatar, width)
let (titleRect, numberOfLinesForTitle) = TimelineCellLayout.rectForTitle(textBoxRect, appearance, cellData)
@ -94,8 +94,9 @@ private extension TimelineCellLayout {
// Returned height is a placeholder. Not needed when this is calculated.
let textBoxOriginX = appearance.cellPadding.left + appearance.unreadCircleDimension + appearance.unreadCircleMarginRight
let textBoxMaxX = floor((width - appearance.cellPadding.right) - (showAvatar ? appearance.avatarSize.width + appearance.avatarMarginLeft : 0.0))
let avatarSpace = showAvatar ? appearance.avatarSize.width + appearance.avatarMarginRight : 0.0
let textBoxOriginX = appearance.cellPadding.left + appearance.unreadCircleDimension + appearance.unreadCircleMarginRight + avatarSpace
let textBoxMaxX = floor(width - appearance.cellPadding.right)
let textBoxWidth = floor(textBoxMaxX - textBoxOriginX)
let textBoxRect = NSRect(x: textBoxOriginX, y: appearance.cellPadding.top, width: textBoxWidth, height: 1000000)
@ -204,16 +205,8 @@ private extension TimelineCellLayout {
return r
}
r.size = appearance.avatarSize
r.origin.x = (width - appearance.cellPadding.right) - r.size.width
r.origin.y = textBoxRect.origin.y + 4.0
// r = RSRectCenteredVerticallyInRect(r, textBoxRect)
// if height > 0.1 {
// let bounds = NSRect(x: 0.0, y: 0.0, width: width, height: height)
// r = RSRectCenteredVerticallyInRect(r, bounds)
// }
// else {
// r = RSRectCenteredVerticallyInRect(r, textBoxRect)
// }
r.origin.x = appearance.cellPadding.left + appearance.unreadCircleDimension + appearance.unreadCircleMarginRight
r.origin.y = textBoxRect.origin.y + appearance.avatarAdjustmentTop
return r
}