Fix #2424

iina · May 29, 2019 · 818b436 · 818b436
1 parent 425f221
commit 818b436
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/iina/MenuController.swift b/iina/MenuController.swift
@@ -396,12 +396,21 @@ class MenuController: NSObject, NSMenuDelegate {
   private func updateChapterList() {
     chapterMenu.removeAllItems()
     let info = PlayerCore.active.info
+    let padder = { (time: String) -> String in
+      let standard = (info.chapters.last?.time.stringRepresentation ?? "").reversed()
+      return String((time.reversed() + standard[standard.index(standard.startIndex, offsetBy: time.count)...].map {
+        $0 == ":" ? ":" : "0"
+      }).reversed())
+    }
     for (index, chapter) in info.chapters.enumerated() {
-      let menuTitle = "\(chapter.time.stringRepresentation) - \(chapter.title)"
+      let menuTitle = "\(padder(chapter.time.stringRepresentation)) – \(chapter.title)"
       let nextChapterTime = info.chapters[at: index+1]?.time ?? Constants.Time.infinite
       let isPlaying = info.videoPosition?.between(chapter.time, nextChapterTime) ?? false
-      chapterMenu.addItem(withTitle: menuTitle, action: #selector(MainMenuActionHandler.menuChapterSwitch(_:)),
+      let menuItem = NSMenuItem(title: menuTitle, action: #selector(MainMenuActionHandler.menuChapterSwitch(_:)), keyEquivalent: "")
-                          tag: index, obj: nil, stateOn: isPlaying)
+      menuItem.tag = index
+      menuItem.state = isPlaying ? .on : .off
+      menuItem.attributedTitle = NSAttributedString(string: menuTitle, attributes: [.font: NSFont.monospacedDigitSystemFont(ofSize: 0, weight: .regular)])
+      chapterMenu.addItem(menuItem)
     }
   }