renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement custom separator since the builtin separator is crazy when animating adds and deletes. Issue #1192

Browse Source
This commit is contained in:
Maurice Parker
2019-10-28 19:52:50 -05:00
parent 29efea3d00
commit 8cb080da6d
3 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift
View File

@@ -27,7 +27,7 @@ struct MasterFeedTableViewCellLayout {
let titleRect: CGRect
let unreadCountRect: CGRect
let disclosureButtonRect: CGRect
let separatorInsets: UIEdgeInsets
let separatorRect: CGRect
let height: CGFloat
@@ -60,13 +60,6 @@ struct MasterFeedTableViewCellLayout {
rFavicon = CGRect(x: x, y: y, width: MasterFeedTableViewCellLayout.imageSize.width, height: MasterFeedTableViewCellLayout.imageSize.height)
}
// Separator Insets
if shouldShowDisclosure {
separatorInsets = UIEdgeInsets(top: 0, left: MasterFeedTableViewCellLayout.disclosureButtonSize.width, bottom: 0, right: 0)
} else {
separatorInsets = UIEdgeInsets(top: 0, left: rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight, bottom: 0, right: 0)
}
// Unread Count
let unreadCountSize = unreadCountView.contentSize
let unreadCountIsHidden = unreadCountView.unreadCount < 1
@@ -105,6 +98,15 @@ struct MasterFeedTableViewCellLayout {
rDisclosure = MasterFeedTableViewCellLayout.centerVertically(rDisclosure, newBounds)
}
// Separator Insets
var separatorInset = CGFloat.zero
if shouldShowDisclosure {
separatorInset = MasterFeedTableViewCellLayout.disclosureButtonSize.width
} else {
separatorInset = rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight
}
separatorRect = CGRect(x: separatorInset, y: cellHeight - 0.5, width: cellWidth - separatorInset, height: 0.5)
// Assign the properties
self.height = cellHeight
self.faviconRect = rFavicon