From 4518357e0957071302e97e02d427d6a7400f90dc Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 4 Mar 2019 18:08:53 -0600 Subject: [PATCH] Made it so that tabbing to the timeline selects something. Issue #558. --- .../Sidebar/Keyboard/SidebarKeyboardShortcuts.plist | 6 ++++++ .../MainWindow/Timeline/TimelineTableView.swift | 10 ---------- .../MainWindow/Timeline/TimelineViewController.swift | 3 +++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist b/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist index 6ff6c91de..39d6526c4 100644 --- a/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist +++ b/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist @@ -2,6 +2,12 @@ + + key + [tab] + action + navigateToTimeline: + key , diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift index 98eb9bc42..bc2f4451f 100644 --- a/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift @@ -20,16 +20,6 @@ class TimelineTableView: NSTableView { } super.keyDown(with: event) } - -// override func becomeFirstResponder() -> Bool { -// if super.becomeFirstResponder() { -// if selectedRow == -1 && numberOfRows > 0 { -// rs_selectRowAndScrollToVisible(0) -// } -// return true -// } -// return false -// } // MARK: - NSView diff --git a/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift index f84cb6358..e69473f54 100644 --- a/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift @@ -375,6 +375,9 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner { } window.makeFirstResponderUnlessDescendantIsFirstResponder(tableView) + if !hasAtLeastOneSelectedArticle && articles.count > 0 { + tableView.rs_selectRowAndScrollToVisible(0) + } } // MARK: - Notifications