From bbea4655005d7dc1329f21c541a227164a2b3844 Mon Sep 17 00:00:00 2001
From: Serg <redetection@gmail.com>
Date: Sat, 12 May 2018 12:02:45 +0700
Subject: [PATCH] hide button property, cleanup nasty code

---
 MTMR/AppleScriptTouchBarItem.swift    |  2 +-
 MTMR/CustomButtonTouchBarItem.swift   |  2 +-
 MTMR/ScrollViewItem.swift             |  1 -
 MTMR/Widgets/CurrencyBarItem.swift    |  2 --
 MTMR/Widgets/InputSourceBarItem.swift | 11 +++--------
 MTMR/Widgets/TimeTouchBarItem.swift   |  3 +--
 MTMR/Widgets/WeatherBarItem.swift     |  2 --
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/MTMR/AppleScriptTouchBarItem.swift b/MTMR/AppleScriptTouchBarItem.swift
index a0bba70..82b54b6 100644
--- a/MTMR/AppleScriptTouchBarItem.swift
+++ b/MTMR/AppleScriptTouchBarItem.swift
@@ -14,7 +14,7 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
             return
         }
         self.script = script
-        button.bezelColor = .clear
+        self.isBordered = false
         DispatchQueue.main.async {
             var error: NSDictionary?
             guard script.compileAndReturnError(&error) else {
diff --git a/MTMR/CustomButtonTouchBarItem.swift b/MTMR/CustomButtonTouchBarItem.swift
index b1b91d6..a181668 100644
--- a/MTMR/CustomButtonTouchBarItem.swift
+++ b/MTMR/CustomButtonTouchBarItem.swift
@@ -11,7 +11,7 @@ import Cocoa
 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
     var tapClosure: (() -> ())?
     var longTapClosure: (() -> ())?
-    private(set) var button: NSButton! //todo hide completely
+    private var button: NSButton!
     
     private var singleClick: NSClickGestureRecognizer!
     private var longClick: NSPressGestureRecognizer!
diff --git a/MTMR/ScrollViewItem.swift b/MTMR/ScrollViewItem.swift
index c4fc12c..7fe49ea 100644
--- a/MTMR/ScrollViewItem.swift
+++ b/MTMR/ScrollViewItem.swift
@@ -10,7 +10,6 @@ class ScrollViewItem: NSCustomTouchBarItem {
         stackView.orientation = .horizontal
         let scrollView = NSScrollView(frame: CGRect(origin: .zero, size: stackView.fittingSize))
         scrollView.documentView = stackView
-//        scrollView.documentView?.bounds.origin = CGPoint(x: 0.0, y: -2.5)
         self.view = scrollView
     }
     
diff --git a/MTMR/Widgets/CurrencyBarItem.swift b/MTMR/Widgets/CurrencyBarItem.swift
index 6980ddb..f7d05a0 100644
--- a/MTMR/Widgets/CurrencyBarItem.swift
+++ b/MTMR/Widgets/CurrencyBarItem.swift
@@ -50,8 +50,6 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
 
         super.init(identifier: identifier, title: "⏳")
 
-        self.view = button
-
         activity.repeats = true
         activity.qualityOfService = .utility
         activity.schedule { (completion: NSBackgroundActivityScheduler.CompletionHandler) in
diff --git a/MTMR/Widgets/InputSourceBarItem.swift b/MTMR/Widgets/InputSourceBarItem.swift
index 98f39c7..e543303 100644
--- a/MTMR/Widgets/InputSourceBarItem.swift
+++ b/MTMR/Widgets/InputSourceBarItem.swift
@@ -19,9 +19,9 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
 
         observeIputSourceChangedNotification();
         textInputSourceDidChange()
-
-        self.button.cell?.action = #selector(switchInputSource)
-        self.button.action = #selector(switchInputSource)
+        self.tapClosure = { [weak self] in
+            self?.switchInputSource()
+        }
     }
 
     required init?(coder: NSCoder) {
@@ -32,11 +32,6 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
         CFNotificationCenterRemoveEveryObserver(notificationCenter, UnsafeRawPointer(Unmanaged.passUnretained(self).toOpaque()));
     }
     
-    @objc override func handleGestureSingle(gr: NSClickGestureRecognizer) {
-        super.handleGestureSingle(gr: gr)
-        switchInputSource()
-    }
-
     @objc public func textInputSourceDidChange() {
         let currentSource = TISCopyCurrentKeyboardInputSource().takeUnretainedValue()
 
diff --git a/MTMR/Widgets/TimeTouchBarItem.swift b/MTMR/Widgets/TimeTouchBarItem.swift
index 882039f..5f7810a 100644
--- a/MTMR/Widgets/TimeTouchBarItem.swift
+++ b/MTMR/Widgets/TimeTouchBarItem.swift
@@ -8,8 +8,7 @@ class TimeTouchBarItem: CustomButtonTouchBarItem {
         dateFormatter.setLocalizedDateFormatFromTemplate(formatTemplate)
         super.init(identifier: identifier, title: " ")
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTime), userInfo: nil, repeats: true)
-        self.view = button
-        button.bezelColor = .clear
+        self.isBordered = false
         updateTime()
     }
     
diff --git a/MTMR/Widgets/WeatherBarItem.swift b/MTMR/Widgets/WeatherBarItem.swift
index 1440b15..8d1e242 100644
--- a/MTMR/Widgets/WeatherBarItem.swift
+++ b/MTMR/Widgets/WeatherBarItem.swift
@@ -43,8 +43,6 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
         }
         
         super.init(identifier: identifier, title: "⏳")
-
-        self.view = button
         
         let status = CLLocationManager.authorizationStatus()
         if status == .restricted || status == .denied {