Skip to content

Commit cc2cedf

Browse files
committed
1 parent 5dcbf2e commit cc2cedf

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/vs/base/browser/ui/splitview/splitview.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export interface IViewOptions {
4444
}
4545

4646
export interface IView extends ee.IEventEmitter {
47-
readonly initialSize: number;
47+
preferredSize: number;
4848
size: number;
4949
sizing: ViewSizing;
5050
fixedSize: number;
@@ -75,7 +75,7 @@ export abstract class View extends ee.EventEmitter implements IView {
7575
protected _fixedSize: number;
7676
protected _minimumSize: number;
7777

78-
constructor(public initialSize: number, opts: IViewOptions) {
78+
constructor(public preferredSize: number, opts: IViewOptions) {
7979
super();
8080

8181
this.size = 0;
@@ -275,8 +275,8 @@ export abstract class AbstractCollapsibleView extends HeaderView {
275275

276276
this.setBodySize(types.isUndefined(opts.bodySize) ? 22 : opts.bodySize);
277277

278-
if (typeof this.initialSize === 'undefined') {
279-
this.initialSize = this._bodySize + this.headerSize;
278+
if (typeof this.preferredSize === 'undefined') {
279+
this.preferredSize = this._bodySize + this.headerSize;
280280
}
281281

282282
this.changeState(types.isUndefined(opts.initialState) ? CollapsibleState.EXPANDED : opts.initialState);
@@ -821,7 +821,7 @@ export class SplitView extends lifecycle.Disposable implements
821821
let diff = event.current - this.state.start;
822822

823823
for (let i = 0; i < this.views.length; i++) {
824-
this.views[i].size = this.state.sizes[i];
824+
this.views[i].size = this.views[i].preferredSize = this.state.sizes[i];
825825
}
826826

827827
if (diff < 0) {
@@ -857,7 +857,7 @@ export class SplitView extends lifecycle.Disposable implements
857857

858858
this.views.forEach((v, i) => {
859859
if (v.sizing === ViewSizing.Flexible) {
860-
totalWeight += v.initialSize;
860+
totalWeight += v.preferredSize;
861861
} else {
862862
fixedSize += v.fixedSize;
863863
}
@@ -870,7 +870,7 @@ export class SplitView extends lifecycle.Disposable implements
870870
if (totalWeight === 0) {
871871
v.size = flexibleSize;
872872
} else {
873-
v.size = v.initialSize * flexibleSize / totalWeight;
873+
v.size = v.preferredSize * flexibleSize / totalWeight;
874874
}
875875
} else {
876876
v.size = v.fixedSize;

0 commit comments

Comments
 (0)