diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard index fda3b05df..bf21f02f6 100644 --- a/Mac/Base.lproj/MainWindow.storyboard +++ b/Mac/Base.lproj/MainWindow.storyboard @@ -450,24 +450,25 @@ - + - + + - + - + @@ -505,10 +506,10 @@ + - diff --git a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift index e85dbbbd6..6972d9aa1 100644 --- a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift @@ -58,6 +58,10 @@ final class TimelineContainerViewController: NSViewController { super.viewDidLoad() setRepresentedObjects(nil, mode: .regular) showTimeline(for: .regular) + + makeMenuItemTitleLarger(newestToOldestMenuItem) + makeMenuItemTitleLarger(oldestToNewestMenuItem) + makeMenuItemTitleLarger(groupByFeedMenuItem) updateViewOptionsPopUpButton() NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil) @@ -144,6 +148,11 @@ extension TimelineContainerViewController: TimelineDelegate { private extension TimelineContainerViewController { + func makeMenuItemTitleLarger(_ menuItem: NSMenuItem) { + menuItem.attributedTitle = NSAttributedString(string: menuItem.title, + attributes: [NSAttributedString.Key.font: NSFont.controlContentFont(ofSize: NSFont.systemFontSize)]) + } + func timelineViewController(for mode: TimelineSourceMode) -> TimelineViewController { switch mode { case .regular: @@ -165,18 +174,14 @@ private extension TimelineContainerViewController { } func updateViewOptionsPopUpButton() { - let localizedTitle = NSLocalizedString("Sort %@", comment: "Sort") - if AppDefaults.shared.timelineSortDirection == .orderedAscending { newestToOldestMenuItem.state = .off oldestToNewestMenuItem.state = .on - let title = NSString.localizedStringWithFormat(localizedTitle as NSString, oldestToNewestMenuItem.title) as String - viewOptionsPopUpButton.setTitle(title) + viewOptionsPopUpButton.setTitle(oldestToNewestMenuItem.title) } else { newestToOldestMenuItem.state = .on oldestToNewestMenuItem.state = .off - let title = NSString.localizedStringWithFormat(localizedTitle as NSString, newestToOldestMenuItem.title) as String - viewOptionsPopUpButton.setTitle(title) + viewOptionsPopUpButton.setTitle(newestToOldestMenuItem.title) } if AppDefaults.shared.timelineGroupByFeed == true {