adopt in panel and revert unnecessary changes

sbatten · sbatten · commit 20acf30da2fe · 2020-04-17T14:59:57.000-07:00
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -693,9 +693,4 @@ export class ToggleCompositePinnedAction extends Action {
 			this.compositeBar.pin(id);
 		}
 	}
-
-	setActivity(activity: IActivity): void {
-		this.activity = activity;
-		this.label = activity.name;
-	}
 }
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -200,6 +200,10 @@ export class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinne
 	constructor(id: string, compositeBar: ICompositeBar) {
 		super({ id, name: id, cssClass: undefined }, compositeBar);
 	}
+
+	setActivity(activity: IActivity): void {
+		this.label = activity.name;
+	}
 }
 
 
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -39,6 +39,7 @@ import { ViewMenuActions } from 'vs/workbench/browser/parts/views/viewMenuAction
 import { IPaneComposite } from 'vs/workbench/common/panecomposite';
 import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common/storageKeys';
 import { Before2D } from 'vs/workbench/browser/dnd';
+import { IActivity } from 'vs/workbench/common/activity';
 
 interface ICachedPanel {
 	id: string;
@@ -209,12 +210,16 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
 		for (const panel of panels) {
 			this.enableCompositeActions(panel);
-			const viewContainer = this.getViewContainer(panel.id);
-			if (viewContainer?.hideIfEmpty) {
-				const viewDescriptors = this.viewDescriptorService.getViewDescriptors(viewContainer);
-				this.onDidChangeActiveViews(panel, viewDescriptors);
-				this.panelDisposables.set(panel.id, viewDescriptors.onDidChangeActiveViews(() => this.onDidChangeActiveViews(panel, viewDescriptors)));
-			}
+			const viewContainer = this.getViewContainer(panel.id)!;
+			const viewDescriptors = this.viewDescriptorService.getViewDescriptors(viewContainer);
+			this.onDidChangeActiveViews(panel, viewDescriptors, viewContainer.hideIfEmpty);
+
+			const disposables = new DisposableStore();
+			disposables.add(viewDescriptors.onDidChangeActiveViews(() => this.onDidChangeActiveViews(panel, viewDescriptors, viewContainer.hideIfEmpty)));
+			disposables.add(viewDescriptors.onDidChangeViews(() => this.onDidUpdateViews(panel, viewDescriptors)));
+			disposables.add(viewDescriptors.onDidMove(() => this.onDidUpdateViews(panel, viewDescriptors)));
+
+			this.panelDisposables.set(panel.id, disposables);
 		}
 	}
 
@@ -230,19 +235,37 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
 	private enableCompositeActions(panel: PanelDescriptor): void {
 		const { activityAction, pinnedAction } = this.getCompositeActions(panel.id);
-		if (activityAction instanceof PlaceHolderPanelActivityAction) {
-			activityAction.setActivity(panel);
-		}
+		activityAction.setActivity(panel);
 
 		if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {
 			pinnedAction.setActivity(panel);
 		}
 	}
 
-	private onDidChangeActiveViews(panel: PanelDescriptor, viewDescriptors: IViewDescriptorCollection): void {
+	private updateActivity(panel: PanelDescriptor, viewDescriptors: IViewDescriptorCollection): void {
+		const activity: IActivity = {
+			id: panel.id,
+			name: viewDescriptors.getTitle(),
+			keybindingId: panel.keybindingId
+		};
+
+		const { activityAction, pinnedAction } = this.getCompositeActions(panel.id);
+		activityAction.setActivity(activity);
+
+		if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {
+			pinnedAction.setActivity(activity);
+		}
+	}
+
+	private onDidUpdateViews(panel: PanelDescriptor, viewDescriptors: IViewDescriptorCollection): void {
+		this.updateActivity(panel, viewDescriptors);
+	}
+
+	private onDidChangeActiveViews(panel: PanelDescriptor, viewDescriptors: IViewDescriptorCollection, hideIfEmpty?: boolean): void {
 		if (viewDescriptors.activeViewDescriptors.length) {
+			this.updateActivity(panel, viewDescriptors);
 			this.compositeBar.addComposite(panel);
-		} else {
+		} else if (hideIfEmpty) {
 			this.hideComposite(panel.id);
 		}
 	}
@@ -540,28 +563,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return false;
 	}
 
-	protected onTitleAreaUpdate(compositeId: string): void {
-		super.onTitleAreaUpdate(compositeId);
-
-		const activePanel = this.getActivePanel();
-		const panel = this.createComposite(compositeId, activePanel?.getId() === compositeId);
-
-		if (panel) {
-			const compositeActions = this.compositeActions.get(compositeId);
-			if (compositeActions) {
-				compositeActions.activityAction.setActivity({
-					id: compositeActions.activityAction.id,
-					name: panel.getTitle() || compositeActions.activityAction.label
-				});
-
-				compositeActions.pinnedAction.setActivity({
-					id: compositeActions.activityAction.id,
-					name: panel.getTitle() || compositeActions.activityAction.label
-				});
-			}
-		}
-	}
-
 	private getToolbarWidth(): number {
 		const activePanel = this.getActivePanel();
 		if (!activePanel || !this.toolBar) {

Original file line number	Diff line number	Diff line change
`@@ -693,9 +693,4 @@ export class ToggleCompositePinnedAction extends Action {`
`693`	`693`	`this.compositeBar.pin(id);`
`694`	`694`	`}`
`695`	`695`	`}`
`696`		`-`
`697`		`- setActivity(activity: IActivity): void {`
`698`		`- this.activity = activity;`
`699`		`- this.label = activity.name;`
`700`		`- }`
`701`	`696`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,10 @@ export class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinne`
`200`	`200`	`constructor(id: string, compositeBar: ICompositeBar) {`
`201`	`201`	`super({ id, name: id, cssClass: undefined }, compositeBar);`
`202`	`202`	`}`
	`203`	`+`
	`204`	`+ setActivity(activity: IActivity): void {`
	`205`	`+ this.label = activity.name;`
	`206`	`+ }`
`203`	`207`	`}`
`204`	`208`
`205`	`209`