From bbc3d9dcfe86e8ced9c8e8d0e972d80db35248dd Mon Sep 17 00:00:00 2001 From: Serg Date: Sat, 14 Apr 2018 00:32:12 +0700 Subject: [PATCH] filter center items, prepare for scrollView --- MTMR/TouchBarController.swift | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift index 5f0dd25..3806629 100644 --- a/MTMR/TouchBarController.swift +++ b/MTMR/TouchBarController.swift @@ -47,6 +47,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate { var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:] var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:] var orderedIdentifiers: [NSTouchBarItem.Identifier] = [] + var centerItems: [NSTouchBarItem] = [] private override init() { super.init() @@ -56,6 +57,9 @@ class TouchBarController: NSObject, NSTouchBarDelegate { loadItemDefinitions() createItems() + centerItems = self.orderedIdentifiers.flatMap { identifier -> NSTouchBarItem? in + return itemDefinitions[identifier]?.centerAligned == true ? items[identifier] : nil + } touchBar.delegate = self touchBar.defaultItemIdentifiers = self.orderedIdentifiers @@ -110,7 +114,9 @@ class TouchBarController: NSObject, NSTouchBarDelegate { } func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? { - guard let item = self.items[identifier] else { + guard let item = self.items[identifier], + let definition = self.itemDefinitions[identifier], + !definition.centerAligned else { return nil } return item @@ -133,6 +139,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate { barItem = VolumeViewController(identifier: identifier) case .brightness: barItem = BrightnessViewController(identifier: identifier) +// case .scrollArea: +// for item in centerItems { +// //todo:add item.view to scrollview +// } } for parameter in item.additionalParameters { if case .width(let value) = parameter, let widthBarItem = barItem as? CanSetWidth {