minor fix

icestraw · Jan 20, 2019 · 12e625f · 12e625f
1 parent d2cf345
commit 12e625f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/LyricsX/Component/TouchBarCurrentPlayingItem.swift b/LyricsX/Component/TouchBarCurrentPlayingItem.swift
@@ -53,12 +53,10 @@ class TouchBarArtworkViewController: NSViewController {
 
     override func viewDidLoad() {
         reloadImage()
-        observation = NotificationCenter.default.addObserver(forName: .currentTrackChange, object: AppController.shared, queue: .main) { [unowned self] _ in
-            self.reloadImage()
-        }
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadImage), name: .currentTrackChange, object: nil)
     }
 
-    func reloadImage() {
+    @objc func reloadImage() {
         guard let player = AppController.shared.playerManager.player else {
             artworkView.image = nil
             return

diff --git a/LyricsX/Component/TouchBarLyricsItem.swift b/LyricsX/Component/TouchBarLyricsItem.swift
@@ -39,13 +39,8 @@ class TouchBarLyricsItem: NSCustomTouchBarItem {
     }
 
     func commonInit() {
-        view.addSubview(lyricsTextField)
-        lyricsTextField.snp.makeConstraints { make in
-            make.top.bottom.right.equalToSuperview()
-            // For some reason the left edge get clipped without the offset.
-            make.left.equalToSuperview().offset(4)
-        }
-        lyricsTextField.alignment = .center
+        view = lyricsTextField
+        handleLyricsDisplay()
         NotificationCenter.default.addObserver(self, selector: #selector(self.handleLyricsDisplay), name: .lyricsShouldDisplay, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(self.handleLyricsDisplay), name: .currentLyricsChange, object: nil)
     }

diff --git a/LyricsX/Controller/KaraokeLyricsController.swift b/LyricsX/Controller/KaraokeLyricsController.swift
@@ -52,12 +52,15 @@ class KaraokeLyricsWindowController: NSWindowController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
             self.lyricsView.displayLrc("")
             self.handleLyricsDisplay()
-            self.observeNotification(name: .lyricsShouldDisplay, using: { [unowned self] _ in
+            self.observeNotification(name: .lyricsShouldDisplay) { [unowned self] _ in
                 self.handleLyricsDisplay()
-            })
-            self.observeNotification(name: .currentLyricsChange, using: { [unowned self] _ in
+            }
+            self.observeNotification(name: .currentLyricsChange) { [unowned self] _ in
+                self.handleLyricsDisplay()
+            }
+            self.observeDefaults(keys: [.PreferBilingualLyrics, .DesktopLyricsOneLineMode]) { [unowned self] in
                 self.handleLyricsDisplay()
-            })
+            }
         }
     }
 

diff --git a/LyricsX/Controller/TouchBarLyrics.swift b/LyricsX/Controller/TouchBarLyrics.swift
@@ -46,11 +46,7 @@ class TouchBarLyrics: NSObject, NSTouchBarDelegate {
 
         lyricsItem.bind(\.progressColor, withUnmatchedDefaultName: .DesktopLyricsProgressColor)
 
-        let nc = NSUserNotificationCenter.default
-        nc.observeNotification(name: NSApplication.didBecomeActiveNotification) { _ in
-            self.systemTrayItem.setControlStripPresence(false)
-        }
-        nc.observeNotification(name: NSApplication.didResignActiveNotification) { _ in
+        NSUserNotificationCenter.default.observeNotification(name: NSApplication.didBecomeActiveNotification) { _ in
             self.systemTrayItem.setControlStripPresence(true)
         }
     }

diff --git a/LyricsX/Supporting Files/Info.plist b/LyricsX/Supporting Files/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>2046</string>
+	<string>2056</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>