[macos] Name custom style in toolbar

Display the custom style’s name in the Style toolbar button.
mapbox · Nov 28, 2016 · f611355 · f611355
1 parent 992726a
commit f611355
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/platform/macos/app/Base.lproj/MapDocument.xib b/platform/macos/app/Base.lproj/MapDocument.xib
@@ -26,6 +26,7 @@
         <objectController objectClassName="MGLStyle" id="Xji-k6-iQ4" userLabel="Style Object Controller">
             <declaredKeys>
                 <string>layers</string>
+                <string>name</string>
             </declaredKeys>
             <connections>
                 <binding destination="jxx-uM-ZTC" name="contentObject" keyPath="selection.style" id="60N-aU-tgJ"/>

diff --git a/platform/macos/app/MapDocument.m b/platform/macos/app/MapDocument.m
@@ -865,10 +865,13 @@ - (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
         NSPopUpButton *popUpButton = (NSPopUpButton *)toolbarItem.view;
         NSUInteger index = self.indexOfStyleInToolbarItem;
         if (index == NSNotFound) {
-            [popUpButton addItemWithTitle:@"Custom"];
-            index = [popUpButton numberOfItems] - 1;
+            index = -1;
         }
         [popUpButton selectItemAtIndex:index];
+        if (index == -1) {
+            NSString *name = self.mapView.style.name;
+            popUpButton.title = name ?: @"Custom";
+        }
     }
     if (action == @selector(toggleLayers:)) {
         BOOL isShown = ![self.splitView isSubviewCollapsed:self.splitView.arrangedSubviews.firstObject];