ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/base/browser/ui/grid/grid.ts
View File

@@ -5,7 +5,7 @@
import 'vs/css!./gridview';
import { Orientation } from 'vs/base/browser/ui/sash/sash';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { Disposable } from 'vs/base/common/lifecycle';
import { tail2 as tail, equals } from 'vs/base/common/arrays';
import { orthogonal, IView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles } from './gridview';
import { Event, Emitter } from 'vs/base/common/event';
@@ -191,12 +191,10 @@ export interface IGridOptions {
proportionalLayout?: boolean;
}
export class Grid<T extends IView> implements IDisposable {
export class Grid<T extends IView> extends Disposable {
protected gridview: GridView;
private views = new Map<T, HTMLElement>();
private disposables: IDisposable[] = [];
get orientation(): Orientation { return this.gridview.orientation; }
set orientation(orientation: Orientation) { this.gridview.orientation = orientation; }
@@ -214,10 +212,11 @@ export class Grid<T extends IView> implements IDisposable {
sashResetSizing: Sizing = Sizing.Distribute;
constructor(view: T, options: IGridOptions = {}) {
super();
this.gridview = new GridView(options);
this.disposables.push(this.gridview);
this._register(this.gridview);
this.gridview.onDidSashReset(this.doResetViewSize, this, this.disposables);
this._register(this.gridview.onDidSashReset(this.doResetViewSize, this));
this._addView(view, 0, [0]);
}
@@ -375,10 +374,6 @@ export class Grid<T extends IView> implements IDisposable {
this.gridview.distributeViewSizes(parentLocation);
}
}
dispose(): void {
this.disposables = dispose(this.disposables);
}
}
export interface ISerializableView extends IView {