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 pull request #3987 from GetToSet/ethanwong/sidabar-activation

Browse Source 
Do not make the sidebar first responder when it’s collapsed.
This commit is contained in:
Brent Simmons
2023-05-30 22:19:45 -07:00
committed by GitHub
parent a5fa7a2a83 cc99524dce
commit bd47c699a7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/MainWindow/MainWindowController.swift
View File

@@ -87,7 +87,9 @@ enum TimelineSourceMode {
detailSplitViewItem?.minimumThickness = CGFloat(MainWindowController.detailViewMinimumThickness)
sidebarViewController = splitViewController?.splitViewItems[0].viewController as? SidebarViewController
let sidebarSplitViewItem = splitViewController?.splitViewItems[0]
sidebarViewController = sidebarSplitViewItem?.viewController as? SidebarViewController
sidebarViewController!.splitViewItem = sidebarSplitViewItem
sidebarViewController!.delegate = self
timelineContainerViewController = splitViewController?.splitViewItems[1].viewController as? TimelineContainerViewController

3
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@@ -29,6 +29,8 @@ protocol SidebarDelegate: AnyObject {
weak var delegate: SidebarDelegate?
weak var splitViewItem: NSSplitViewItem?
private let rebuildTreeAndRestoreSelectionQueue = CoalescingQueue(name: "Rebuild Tree Queue", interval: 1.0)
let treeControllerDelegate = WebFeedTreeControllerDelegate()
lazy var treeController: TreeController = {
@@ -323,6 +325,7 @@ protocol SidebarDelegate: AnyObject {
}
func focus() {
if splitViewItem?.isCollapsed == true { return }
outlineView.window?.makeFirstResponderUnlessDescendantIsFirstResponder(outlineView)
}