From ffbbafa9d97bc8ea1cc695df31f8b9c07a3ee553 Mon Sep 17 00:00:00 2001
From: Toxblh <toxblh@gmail.com>
Date: Mon, 23 Apr 2018 00:54:29 +0100
Subject: [PATCH] Fixed central sort. Close #33

---
 MTMR/SupportHelpers.swift     |  7 +++++++
 MTMR/TouchBarController.swift | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/MTMR/SupportHelpers.swift b/MTMR/SupportHelpers.swift
index d18e9ca..2425183 100644
--- a/MTMR/SupportHelpers.swift
+++ b/MTMR/SupportHelpers.swift
@@ -23,6 +23,11 @@ extension String {
         return substring(from: range.lowerBound, to: range.upperBound)
     }
     
+    func indexDistance(of character: Character) -> Int? {
+        guard let index = index(of: character) else { return nil }
+        return distance(from: startIndex, to: index)
+    }
+    
     func stripComments() -> String {
         let str = self
         let singleComment = 1;
@@ -44,6 +49,8 @@ extension String {
             }
             
             if (insideString) {
+                let jumpStr = String(str[str.index(startIndex, offsetBy: i)..<str.endIndex])
+                i += (jumpStr.indexDistance(of: "\""))!
                 continue
             }
             
diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift
index 20c22d5..873c2a7 100644
--- a/MTMR/TouchBarController.swift
+++ b/MTMR/TouchBarController.swift
@@ -55,6 +55,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
     var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
     var leftIdentifiers: [NSTouchBarItem.Identifier] = []
+    var centerIdentifiers: [NSTouchBarItem.Identifier] = []
     var centerItems: [NSTouchBarItem] = []
     var rightIdentifiers: [NSTouchBarItem.Identifier] = []
     var scrollArea: NSCustomTouchBarItem?
@@ -80,9 +81,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         }
         loadItemDefinitions(jsonItems: jsonItems!)
         createItems()
-        centerItems = self.itemDefinitions.compactMap { (identifier, definition) -> NSTouchBarItem? in
-            return definition.align == .center ? items[identifier] : nil
-        }
+        
+        centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
+            return items[identifier]
+        })
         
         self.centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
         self.scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
@@ -118,6 +120,9 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             if item.align == .right {
                 rightIdentifiers.append(identifier)
             }
+            if item.align == .center {
+                centerIdentifiers.append(identifier)
+            }
         }
     }