Add support for setting TouchBarLabel text color

kevinsawicki · kevinsawicki · commit 2680ee9f8f6a · 2017-03-03T15:14:51.000-08:00
diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm
@@ -247,10 +247,18 @@ - (NSTouchBarItem*)makeLabelForID:(NSString*)id
 
 - (void)updateLabel:(NSCustomTouchBarItem*)item
        withSettings:(const mate::PersistentDictionary&)settings {
+  NSTextField* text_field = (NSTextField*)item.view;
+
   std::string label;
   settings.Get("label", &label);
-  NSTextField* text_field = (NSTextField*)item.view;
   text_field.stringValue = base::SysUTF8ToNSString(label);
+
+  std::string textColor;
+  if (settings.Get("textColor", &textColor) && !textColor.empty()) {
+    text_field.textColor = [self colorFromHexColorString:textColor];
+  } else {
+    text_field.textColor = nil;
+  }
 }
 
 - (NSTouchBarItem*)makeColorPickerForID:(NSString*)id
diff --git a/docs/api/touch-bar-label.md b/docs/api/touch-bar-label.md
@@ -8,6 +8,7 @@ Process: [Main](../tutorial/quick-start.md#main-process)
 
 * `options` Object
   * `label` String (optional) - Text to display.
+  * `textColor` String (optional) - Hex color of text, i.e `#ABCDEF`.
 
 ### Instance Properties
 
@@ -17,3 +18,8 @@ The following properties are available on instances of `TouchBarLabel`:
 
 The label's current text. Changing this value immediately updates the label in
 the touch bar.
+
+#### `touchBarLabel.textColor`
+
+The label's current text color. Changing this value immediately updates the
+label in the touch bar.
diff --git a/docs/api/touch-bar.md b/docs/api/touch-bar.md
@@ -80,12 +80,15 @@ const finishSpin = () => {
   if (uniqueValues === 1) {
     // All 3 values are the same
     result.label = '💰 Jackpot!'
+    result.textColor = '#FDFF00'
   } else if (uniqueValues === 2) {
     // 2 values are the same
     result.label = '😍 Winner!'
+    result.textColor = '#FDFF00'
   } else {
     // No values are the same
     result.label = '🙁 Spin Again'
+    result.textColor = null
   }
   spinning = false
 }
@@ -94,7 +97,9 @@ const touchBar = new TouchBar([
   spin,
   new TouchBarSpacer({size: 'large'}),
   reel1,
+  new TouchBarSpacer({size: 'small'}),
   reel2,
+  new TouchBarSpacer({size: 'small'}),
   reel3,
   new TouchBarSpacer({size: 'large'}),
   result
diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js
@@ -164,6 +164,7 @@ TouchBar.TouchBarLabel = class TouchBarLabel extends TouchBarItem {
     if (config == null) config = {}
     this.type = 'label'
     this._addLiveProperty('label', config.label)
+    this._addLiveProperty('textColor', config.textColor)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ TouchBar.TouchBarLabel = class TouchBarLabel extends TouchBarItem {`
`164`	`164`	`if (config == null) config = {}`
`165`	`165`	`this.type = 'label'`
`166`	`166`	`this._addLiveProperty('label', config.label)`
	`167`	`+ this._addLiveProperty('textColor', config.textColor)`
`167`	`168`	`}`
`168`	`169`	`}`
`169`	`170`