From 55177a7f900ed88297e09edbd2214a5e7455a544 Mon Sep 17 00:00:00 2001 From: Serg Date: Fri, 11 May 2018 09:32:42 +0700 Subject: [PATCH] fix currency widget updating --- MTMR/CustomButtonTouchBarItem.swift | 2 +- MTMR/Widgets/CurrencyBarItem.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MTMR/CustomButtonTouchBarItem.swift b/MTMR/CustomButtonTouchBarItem.swift index 2db3971..5804842 100644 --- a/MTMR/CustomButtonTouchBarItem.swift +++ b/MTMR/CustomButtonTouchBarItem.swift @@ -11,7 +11,7 @@ import Cocoa class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate { private let tapClosure: (() -> ())? private let longTapClosure: (() -> ())? - private(set) var button: NSButton! + private(set) var button: NSButton! //todo hide completely private var singleClick: NSClickGestureRecognizer! private var longClick: NSPressGestureRecognizer! diff --git a/MTMR/Widgets/CurrencyBarItem.swift b/MTMR/Widgets/CurrencyBarItem.swift index 9e9137d..eddff4f 100644 --- a/MTMR/Widgets/CurrencyBarItem.swift +++ b/MTMR/Widgets/CurrencyBarItem.swift @@ -109,9 +109,9 @@ class CurrencyBarItem: CustomButtonTouchBarItem { let title = String(format: "%@%.2f", self.prefix, value) - let regularFont = button.attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15) + let regularFont = self.attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15) let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: regularFont]) newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count)) - button.attributedTitle = newTitle + self.attributedTitle = newTitle } }