development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tree view specific visibility fix

Browse source 
Fixes #136802
This commit is contained in:
Alex Ross 2021-11-30 14:18:20 +01:00
parent 827f76521d
commit 3febecac20
No known key found for this signature in database
GPG key ID: 89DDDBA66CBA7840
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/browser/parts/views/treeView.ts
View file

@ -63,6 +63,7 @@ import { Schemas } from 'vs/base/common/network';
export class TreeViewPane extends ViewPane {
protected readonly treeView: ITreeView;
private _container: HTMLElement | undefined;
constructor(
options: IViewletViewOptions,
@ -82,7 +83,11 @@ export class TreeViewPane extends ViewPane {
this._register(this.treeView.onDidChangeActions(() => this.updateActions(), this));
this._register(this.treeView.onDidChangeTitle((newTitle) => this.updateTitle(newTitle)));
this._register(this.treeView.onDidChangeDescription((newDescription) => this.updateTitleDescription(newDescription)));
this._register(toDisposable(() => this.treeView.setVisibility(false)));
this._register(toDisposable(() => {
if (this._container && this.treeView.container && (this._container === this.treeView.container)) {
this.treeView.setVisibility(false);
}
}));
this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
this._register(this.treeView.onDidChangeWelcomeState(() => this._onDidChangeViewWelcomeState.fire()));
if (options.title !== this.treeView.title) {
@ -101,6 +106,7 @@ export class TreeViewPane extends ViewPane {
}
override renderBody(container: HTMLElement): void {
this._container = container;
super.renderBody(container);
this.renderTreeView(container);
}
@ -165,6 +171,7 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
private tree: Tree | undefined;
private treeLabels: ResourceLabels | undefined;
private treeViewDnd: CustomTreeViewDragAndDrop;
private _container: HTMLElement | undefined;
private root: ITreeItem;
private elementsToRefresh: ITreeItem[] = [];
@ -466,6 +473,7 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
}
show(container: HTMLElement): void {
this._container = container;
DOM.append(container, this.domNode);
}
@ -781,6 +789,10 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
this.domNode.removeAttribute('tabindex');
}
}
get container(): HTMLElement | undefined {
return this._container;
}
}
class TreeViewIdentityProvider implements IIdentityProvider<ITreeItem> {

2
src/vs/workbench/browser/parts/views/viewsService.ts
View file

@ -124,7 +124,7 @@ export class ViewsService extends Disposable implements IViewsService {
private onDidChangeContainerLocation(viewContainer: ViewContainer, from: ViewContainerLocation, to: ViewContainerLocation): void {
this.deregisterPaneComposite(viewContainer, from);
setTimeout(() => this.registerPaneComposite(viewContainer, to), 0);
this.registerPaneComposite(viewContainer, to);
}
private onViewDescriptorsAdded(views: ReadonlyArray<IViewDescriptor>, container: ViewContainer): void {

2
src/vs/workbench/common/views.ts
View file

@ -682,6 +682,8 @@ export interface ITreeView extends IDisposable {
readonly onDidChangeWelcomeState: Event<void>;
readonly container: HTMLElement | undefined;
refresh(treeItems?: ITreeItem[]): Promise<void>;
setVisibility(visible: boolean): void;