FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire

Browse Source
This commit is contained in:
Brent Simmons 2025-01-18 20:56:15 -08:00
commit 46c5e75e6c
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/Article Rendering/core.css
View File

@ -114,8 +114,7 @@ img[src*="share-buttons"] {
.newsfoot-footnote-popover .reversefootnote, .newsfoot-footnote-popover .reversefootnote,
.newsfoot-footnote-popover .footnoteBackLink, .newsfoot-footnote-popover .footnoteBackLink,
.newsfoot-footnote-popover .footnote-return, .newsfoot-footnote-popover .footnote-return {
.newsfoot-footnote-popover a[href*='#fn'] {
display: none; display: none;
} }

4
iOS/MainTimeline/TimelineViewController.swift
View File

@ -60,7 +60,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner {
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
// Initialize Programmatic Buttons // Initialize Programmatic Buttons
filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:))) filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:)))
firstUnreadButton = UIBarButtonItem(image: AppAssets.nextUnreadArticleImage, style: .plain, target: self, action: #selector(firstUnread(_:))) firstUnreadButton = UIBarButtonItem(image: AppAssets.nextUnreadArticleImage, style: .plain, target: self, action: #selector(firstUnread(_:)))
@ -603,7 +603,7 @@ extension TimelineViewController: UISearchBarDelegate {
private extension TimelineViewController { private extension TimelineViewController {
func configureToolbar() { func configureToolbar() {
guard !(splitViewController?.isCollapsed ?? true) else { guard !(splitViewController?.isCollapsed ?? true) else {
return return
} }

29
iOS/SceneCoordinator.swift
View File

@ -1308,6 +1308,35 @@ extension SceneCoordinator: UISplitViewControllerDelegate {
} }
} }
func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
switch displayMode {
case .automatic:
return
case .secondaryOnly:
return
case .oneBesideSecondary:
// Timeline + Article - show the refresh control on the timeline
mainTimelineViewController?.toolbarItems?[2].customView?.alpha = 1.0
case .oneOverSecondary:
return
case .twoBesideSecondary:
return
case .twoOverSecondary:
return
case .twoDisplaceSecondary:
// Sidebar + Timeline + Article - hide the refresh control on the timeline
mainTimelineViewController?.toolbarItems?[2].customView?.alpha = 0.0
case .primaryHidden:
return
case .allVisible:
return
case .primaryOverlay:
return
@unknown default:
return
}
}
} }
// MARK: UINavigationControllerDelegate // MARK: UINavigationControllerDelegate