Skip to content

Commit 916287f

Browse files
joaomorenojoaomoreno
committed
remove EditorPart._preferredSize
related to microsoft#67367
1 parent 5cc0211 commit 916287f

2 files changed

Lines changed: 0 additions & 45 deletions

File tree

‎src/vs/workbench/browser/parts/editor/editorPart.ts‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,8 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
112112
private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; } | undefined>());
113113
get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return Event.any(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event); }
114114

115-
private readonly _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>());
116-
readonly onDidPreferredSizeChange: Event<void> = this._onDidPreferredSizeChange.event;
117-
118115
//#endregion
119116

120-
private _preferredSize: Dimension | undefined;
121-
122117
private readonly workspaceMemento: MementoObject;
123118
private readonly globalMemento: MementoObject;
124119

@@ -366,9 +361,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
366361
const newOrientation = (orientation === GroupOrientation.HORIZONTAL) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
367362
if (this.gridWidget.orientation !== newOrientation) {
368363
this.gridWidget.orientation = newOrientation;
369-
370-
// Mark preferred size as changed
371-
this.resetPreferredSize();
372364
}
373365
}
374366

@@ -423,9 +415,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
423415
// Update container
424416
this.updateContainer();
425417

426-
// Mark preferred size as changed
427-
this.resetPreferredSize();
428-
429418
// Events for groups that got added
430419
this.getGroups(GroupsOrder.GRID_APPEARANCE).forEach(groupView => {
431420
if (currentGroupViews.indexOf(groupView) === -1) {
@@ -490,9 +479,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
490479
// Update container
491480
this.updateContainer();
492481

493-
// Mark preferred size as changed
494-
this.resetPreferredSize();
495-
496482
// Event
497483
this._onDidAddGroup.fire(newGroupView);
498484

@@ -661,9 +647,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
661647
// Update container
662648
this.updateContainer();
663649

664-
// Mark preferred size as changed
665-
this.resetPreferredSize();
666-
667650
// Event
668651
this._onDidRemoveGroup.fire(groupView);
669652
}
@@ -764,23 +747,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
764747
get onDidChange(): Event<IViewSize | undefined> { return this.centeredLayoutWidget.onDidChange; }
765748
readonly priority: LayoutPriority = LayoutPriority.High;
766749

767-
get preferredSize(): Dimension {
768-
if (!this._preferredSize) {
769-
this._preferredSize = new Dimension(this.gridWidget.minimumWidth, this.gridWidget.minimumHeight);
770-
}
771-
772-
return this._preferredSize;
773-
}
774-
775-
private resetPreferredSize(): void {
776-
777-
// Reset (will be computed upon next access)
778-
this._preferredSize = undefined;
779-
780-
// Event
781-
this._onDidPreferredSizeChange.fire();
782-
}
783-
784750
private get gridSeparatorBorder(): Color {
785751
return this.theme.getColor(EDITOR_GROUP_BORDER) || this.theme.getColor(contrastBorder) || Color.transparent;
786752
}

‎src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ suite('EditorGroupsService', () => {
118118
groupMovedCounter++;
119119
});
120120

121-
let preferredSizeChangeCounter = 0;
122-
const preferredSizeChangeListener = part.onDidPreferredSizeChange(() => {
123-
preferredSizeChangeCounter++;
124-
});
125-
126121
// always a root group
127122
const rootGroup = part.groups[0];
128123
assert.equal(part.groups.length, 1);
@@ -141,7 +136,6 @@ suite('EditorGroupsService', () => {
141136
assert.equal(part.groups.length, 2);
142137
assert.equal(part.count, 2);
143138
assert.ok(part.activeGroup === rootGroup);
144-
assert.equal(preferredSizeChangeCounter, 1);
145139
assert.equal(rootGroup.label, 'Group 1');
146140
assert.equal(rightGroup.label, 'Group 2');
147141

@@ -189,7 +183,6 @@ suite('EditorGroupsService', () => {
189183
assert.equal(part.groups.length, 3);
190184
assert.ok(part.activeGroup === rightGroup);
191185
assert.ok(!downGroup.activeControl);
192-
assert.equal(preferredSizeChangeCounter, 2);
193186
assert.equal(rootGroup.label, 'Group 1');
194187
assert.equal(rightGroup.label, 'Group 2');
195188
assert.equal(downGroup.label, 'Group 3');
@@ -208,13 +201,11 @@ suite('EditorGroupsService', () => {
208201

209202
part.moveGroup(downGroup, rightGroup, GroupDirection.DOWN);
210203
assert.equal(groupMovedCounter, 1);
211-
assert.equal(preferredSizeChangeCounter, 2);
212204

213205
part.removeGroup(downGroup);
214206
assert.ok(!part.getGroup(downGroup.id));
215207
assert.equal(didDispose, true);
216208
assert.equal(groupRemovedCounter, 1);
217-
assert.equal(preferredSizeChangeCounter, 3);
218209
assert.equal(part.groups.length, 2);
219210
assert.ok(part.activeGroup === rightGroup);
220211
assert.equal(rootGroup.label, 'Group 1');
@@ -254,13 +245,11 @@ suite('EditorGroupsService', () => {
254245
assert.ok(part.activeGroup === rootGroup);
255246

256247
part.setGroupOrientation(part.orientation === GroupOrientation.HORIZONTAL ? GroupOrientation.VERTICAL : GroupOrientation.HORIZONTAL);
257-
assert.equal(preferredSizeChangeCounter, 5);
258248

259249
activeGroupChangeListener.dispose();
260250
groupAddedListener.dispose();
261251
groupRemovedListener.dispose();
262252
groupMovedListener.dispose();
263-
preferredSizeChangeListener.dispose();
264253

265254
part.dispose();
266255
});

0 commit comments

Comments
 (0)