From 0990b727d1190b36af29e65d9351ddd9c519e398 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Sat, 11 Jun 2016 15:43:31 +0200
Subject: [PATCH] fix context passing in toolbar

---
 src/vs/base/browser/ui/toolbar/toolbar.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 808bd86438d..3ef7c64babd 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -86,6 +86,9 @@ export class ToolBar {
 
 	public set context(context: any) {
 		this.actionBar.context = context;
+		if (this.toggleMenuActionItem) {
+			this.toggleMenuActionItem.setActionContext(context);
+		}
 	}
 
 	public getContainer(): Builder {
@@ -228,6 +231,14 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		this.toUnbind = this.addEmitter2(this.dropdownMenu);
 	}
 
+	public setActionContext(newContext: any): void {
+		super.setActionContext(newContext);
+
+		if (this.dropdownMenu) {
+			this.dropdownMenu.menuOptions.context = newContext;
+		}
+	}
+
 	public show(): void {
 		if (this.dropdownMenu) {
 			this.dropdownMenu.show();
-- 
GitLab