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

Merge branch 'ios-candidate'

Browse Source
This commit is contained in:
Maurice Parker
2022-02-27 17:19:48 -06:00
parent ca112bf564 d68d4228f9
commit f869798756
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Shared/Resources/NewsFax.nnwtheme/License.md
View File

@@ -1,4 +1,4 @@
The NewsFax themes uses the ModeSeven font throughout, which is available as Freeware.
The NewsFax themes uses the ModeSeven font throughout, which is available as Freeware. It also includes additional edits from [schriftgestalt](https://github.com/schriftgestalt).
Find out more [here](https://www.fontspace.com/modeseven-font-f2369).
@@ -16,4 +16,5 @@ The character definitions were worked out from a bitmap version of the
Teletext font created by James Fidell, and included in xbeeb (a BBC
Micro emulator for UNIX/X11). The spacing of the original has been
preserved, which is why many character shapes are aligned to the right
of their cells.
of their cells.

13
Shared/Resources/NewsFax.nnwtheme/stylesheet.css
View File

File diff suppressed because one or more lines are too long

6
iOS/SceneCoordinator.swift
View File

@@ -1054,7 +1054,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
return timelineFeed == feed
}
func discloseWebFeed(_ webFeed: WebFeed, animations: Animations = [], completion: (() -> Void)? = nil) {
func discloseWebFeed(_ webFeed: WebFeed, initialLoad: Bool = false, animations: Animations = [], completion: (() -> Void)? = nil) {
if isSearching {
masterTimelineViewController?.hideSearch()
}
@@ -1078,7 +1078,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
self.treeControllerDelegate.addFilterException(parentFolderFeedID)
}
rebuildBackingStores(completion: {
rebuildBackingStores(initialLoad: initialLoad, completion: {
self.treeControllerDelegate.resetFilterExceptions()
self.selectFeed(webFeed, animations: animations, completion: completion)
})
@@ -2108,7 +2108,7 @@ private extension SceneCoordinator {
return
}
self.discloseWebFeed(webFeed) {
self.discloseWebFeed(webFeed, initialLoad: true) {
self.masterFeedViewController.focus()
}
}