From 2fd62d090a7d50cb27a5be089bc34b1aa9c90f5c Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 27 Mar 2017 21:10:14 +1100
Subject: [PATCH] Allow items to be assigned to multiple popovers

---
 atom/browser/ui/cocoa/atom_touch_bar.mm | 51 ++++++++++++++-----------
 lib/browser/api/touch-bar.js            |  5 ++-
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm
index 2bd290bd9ac7..4b60627488fa 100644
--- a/atom/browser/ui/cocoa/atom_touch_bar.mm
+++ b/atom/browser/ui/cocoa/atom_touch_bar.mm
@@ -113,28 +113,11 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
   return nil;
 }
 
-
 - (void)refreshTouchBarItem:(NSTouchBar*)touchBar
-                         id:(const std::string&)item_id {
-  if (![self hasItemWithID:item_id]) return;
-
-  mate::PersistentDictionary settings = settings_[item_id];
-  std::string item_type;
-  settings.Get("type", &item_type);
-
-  NSTouchBarItemIdentifier identifier = [self identifierFromID:item_id
-                                                          type:item_type];
-  if (!identifier) return;
-
-  NSTouchBar* targetTouchBar = touchBar;
-
-  std::string popover_id;
-  if (settings.Get("_popover", &popover_id)) {
-    NSPopoverTouchBarItem* popoverItem = [touchBar itemForIdentifier:[self identifierFromID:popover_id type:"popover"]];
-    targetTouchBar = popoverItem.popoverTouchBar;
-  }
-
-  NSTouchBarItem* item = [targetTouchBar itemForIdentifier:identifier];
+                         id:(NSTouchBarItemIdentifier)identifier
+                         withType:(std::string)item_type
+                         withSettings:(mate::PersistentDictionary)settings {
+  NSTouchBarItem* item = [touchBar itemForIdentifier:identifier];
   if (!item) return;
 
   if (item_type == "button") {
@@ -143,7 +126,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
     [self updateLabel:(NSCustomTouchBarItem*)item withSettings:settings];
   } else if (item_type == "colorpicker") {
     [self updateColorPicker:(NSColorPickerTouchBarItem*)item
-               withSettings:settings];
+              withSettings:settings];
   } else if (item_type == "slider") {
     [self updateSlider:(NSSliderTouchBarItem*)item withSettings:settings];
   } else if (item_type == "popover") {
@@ -174,6 +157,30 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
   }
 }
 
+- (void)refreshTouchBarItem:(NSTouchBar*)touchBar
+                         id:(const std::string&)item_id {
+  if (![self hasItemWithID:item_id]) return;
+
+  mate::PersistentDictionary settings = settings_[item_id];
+  std::string item_type;
+  settings.Get("type", &item_type);
+
+  NSTouchBarItemIdentifier identifier = [self identifierFromID:item_id
+                                                          type:item_type];
+  if (!identifier) return;
+
+  std::vector<std::string> popover_ids;
+  if (settings.Get("_popover", &popover_ids)) {
+    for (size_t i = 0; i < popover_ids.size(); ++i) {
+      std::string popover_id = popover_ids[i];
+      NSPopoverTouchBarItem* popoverItem = [touchBar itemForIdentifier:[self identifierFromID:popover_id type:"popover"]];
+      NSTouchBar* targetTouchBar = popoverItem.popoverTouchBar;
+      [self refreshTouchBarItem:targetTouchBar id:identifier withType:item_type withSettings:settings];
+    }
+  }
+  [self refreshTouchBarItem:touchBar id:identifier withType:item_type withSettings:settings];
+}
+
 - (void)buttonAction:(id)sender {
   NSString* item_id = [NSString stringWithFormat:@"%ld", ((NSButton*)sender).tag];
   window_->NotifyTouchBarItemInteraction([item_id UTF8String],
diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js
index 2bdbdbe2ae8b..d0b7d54a5986 100644
--- a/lib/browser/api/touch-bar.js
+++ b/lib/browser/api/touch-bar.js
@@ -223,7 +223,10 @@ TouchBar.TouchBarPopover = class TouchBarPopover extends TouchBarItem {
     if (!(this.child instanceof TouchBar)) {
       this.child = new TouchBar(this.child)
     }
-    this.child.ordereredItems.forEach((item) => item._popover = this.id)
+    this.child.ordereredItems.forEach((item) => {
+      item._popover = item._popover || []
+      if (!item._popover.find(itemID => itemID === this.id)) item._popover.push(this.id)
+    })
   }
 }