From d8b437114486becdf3f5a5a247fc6386f469a58a Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 18 Feb 2018 22:13:20 -0800 Subject: [PATCH] Make sidebar status view use same background color as source list. --- Evergreen/Base.lproj/MainWindow.storyboard | 2 +- Evergreen/Info.plist | 2 +- .../Sidebar/SidebarStatusBarView.swift | 19 ++++++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Evergreen/Base.lproj/MainWindow.storyboard b/Evergreen/Base.lproj/MainWindow.storyboard index ee93da7a0..78bae30e7 100644 --- a/Evergreen/Base.lproj/MainWindow.storyboard +++ b/Evergreen/Base.lproj/MainWindow.storyboard @@ -361,7 +361,7 @@ - + diff --git a/Evergreen/Info.plist b/Evergreen/Info.plist index 3a1282e8e..511f4486c 100644 --- a/Evergreen/Info.plist +++ b/Evergreen/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0d39 + 1.0d40 CFBundleVersion 522 LSMinimumSystemVersion diff --git a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift index d82c58e7b..dbd4df147 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift +++ b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift @@ -17,6 +17,8 @@ final class SidebarStatusBarView: NSView { @IBOutlet var progressIndicator: NSProgressIndicator! @IBOutlet var progressLabel: NSTextField! + private var didConfigureLayer = false + private var isAnimatingProgress = false { didSet { progressIndicator.isHidden = !isAnimatingProgress @@ -32,7 +34,11 @@ final class SidebarStatusBarView: NSView { override var isFlipped: Bool { return true } - + + override var wantsUpdateLayer: Bool { + return true + } + override func awakeFromNib() { progressIndicator.isHidden = true @@ -45,6 +51,17 @@ final class SidebarStatusBarView: NSView { NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil) } + override func updateLayer() { + + guard let layer = layer, !didConfigureLayer else { + return + } + + let color = NSColor(calibratedWhite: 0.96, alpha: 1.0) + layer.backgroundColor = color.cgColor + didConfigureLayer = true + } + @objc func updateUI() { guard let progress = progress else {