Big Sur: Tab icons in sidebar - quick settings

vtns · Oct 4, 2020 · 6459844 · 6459844
1 parent 8a161fc
commit 6459844
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 50 deletions.
diff --git a/iina/Assets.xcassets/Icons/tab_audio.imageset/Contents.json b/iina/Assets.xcassets/Icons/tab_audio.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "tab_audio.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/iina/Assets.xcassets/Icons/tab_audio.imageset/tab_audio.pdf b/iina/Assets.xcassets/Icons/tab_audio.imageset/tab_audio.pdf
diff --git a/iina/Assets.xcassets/Icons/tab_sub.imageset/Contents.json b/iina/Assets.xcassets/Icons/tab_sub.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "tab_sub.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/iina/Assets.xcassets/Icons/tab_sub.imageset/tab_sub.pdf b/iina/Assets.xcassets/Icons/tab_sub.imageset/tab_sub.pdf
diff --git a/iina/Assets.xcassets/Icons/tab_video.imageset/Contents.json b/iina/Assets.xcassets/Icons/tab_video.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "tab_video.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/iina/Assets.xcassets/Icons/tab_video.imageset/tab_video.pdf b/iina/Assets.xcassets/Icons/tab_video.imageset/tab_video.pdf
diff --git a/iina/Base.lproj/QuickSettingViewController.xib b/iina/Base.lproj/QuickSettingViewController.xib
diff --git a/iina/QuickSettingViewController.swift b/iina/QuickSettingViewController.swift
@@ -132,7 +132,9 @@ class QuickSettingViewController: NSViewController, NSTableViewDataSource, NSTab
       withAllTableViews { tableView, _ in tableView.backgroundColor = NSColor(named: .sidebarTableBackground)! }
     }
 
-    if pendingSwitchRequest != nil {
+    if pendingSwitchRequest == nil {
+      updateTabActiveStatus(withCurrentButton: videoTabBtn)
+    } else {
       switchToTab(pendingSwitchRequest!)
       pendingSwitchRequest = nil
     }
@@ -374,6 +376,16 @@ class QuickSettingViewController: NSViewController, NSTableViewDataSource, NSTab
     updateControlsState()
   }
 
+  private func updateTabActiveStatus(withCurrentButton sender: NSButton) {
+    [videoTabBtn, audioTabBtn, subTabBtn].forEach { btn in
+      if #available(OSX 10.14, *) {
+        btn!.contentTintColor = btn == sender ? .white : NSColor.white.withAlphaComponent(0.5)
+      } else {
+        Utility.setBoldTitle(for: btn!, btn == sender)
+      }
+    }
+  }
+
   private func withAllTableViews(_ block: (NSTableView, MPVTrack.TrackType) -> Void) {
     block(audioTableView, .audio)
     block(subTableView, .sub)
@@ -394,7 +406,7 @@ class QuickSettingViewController: NSViewController, NSTableViewDataSource, NSTab
 
   @IBAction func tabBtnAction(_ sender: NSButton) {
     tabView.selectTabViewItem(at: sender.tag)
-    [videoTabBtn, audioTabBtn, subTabBtn].forEach { Utility.setBoldTitle(for: $0, $0 == sender) }
+    updateTabActiveStatus(withCurrentButton: sender)
     currentTab = .init(buttonTag: sender.tag)
     reload()
   }