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

Update row height in timeline when font setting changes.

Browse Source
This commit is contained in:
Brent Simmons 2018-02-07 21:46:54 -08:00
parent 78530dbb96
commit 2797c607c3
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Evergreen/MainWindow/Timeline/TimelineViewController.swift
View File

@ -36,7 +36,7 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
didSet {
if showFeedNames != oldValue {
updateShowAvatars()
tableView.rowHeight = currentRowHeight
updateTableViewRowHeight()
}
}
}
@ -416,6 +416,7 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
rowHeightWithFeedName = calculateRowHeight(showingFeedNames: true)
rowHeightWithoutFeedName = calculateRowHeight(showingFeedNames: false)
updateTableViewRowHeight()
}
}
@ -587,6 +588,11 @@ private extension TimelineViewController {
}
}
func updateTableViewRowHeight() {
tableView.rowHeight = currentRowHeight
}
func updateShowAvatars() {
if showFeedNames {
@ -617,17 +623,32 @@ private extension TimelineViewController {
func sortDirectionDidChange() {
let selectedArticleIDs = selectedArticles.articleIDs()
performBlockAndRestoreSelection {
let unsortedArticles = Set(articles)
updateArticles(with: unsortedArticles)
}
}
let unsortedArticles = Set(articles)
updateArticles(with: unsortedArticles)
func selectedArticleIDs() -> [String] {
selectArticles(selectedArticleIDs)
return selectedArticles.articleIDs()
}
func restoreSelection(_ articleIDs: [String]) {
selectArticles(articleIDs)
if tableView.selectedRow != -1 {
tableView.scrollRowToVisible(tableView.selectedRow)
}
}
func performBlockAndRestoreSelection(_ block: (() -> Void)) {
let savedSelection = selectedArticleIDs()
block()
restoreSelection(savedSelection)
}
// MARK: Fetching Articles
func fetchArticles() {
@ -672,15 +693,13 @@ private extension TimelineViewController {
return
}
let selectedArticleIDs = selectedArticles.articleIDs()
var unsortedArticles = fetchUnsortedArticles(for: representedObjects)
unsortedArticles.formUnion(Set(articles))
updateArticles(with: unsortedArticles)
selectArticles(selectedArticleIDs)
performBlockAndRestoreSelection {
var unsortedArticles = fetchUnsortedArticles(for: representedObjects)
unsortedArticles.formUnion(Set(articles))
updateArticles(with: unsortedArticles)
}
}
func selectArticles(_ articleIDs: [String]) {
let indexesToSelect = articles.indexesForArticleIDs(Set(articleIDs))