Skip to content

Commit d943811

Browse files
authored
Merge pull request #313443 from mjbvz/dev/mjbvz/inquisitive-tuna
Remove some now redundant webview layout logic
2 parents cdd1c54 + d5ccd0a commit d943811

3 files changed

Lines changed: 0 additions & 30 deletions

File tree

src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
416416
}));
417417

418418
const container = creationOptions.codeWindow ? this.layoutService.getContainer(creationOptions.codeWindow) : this.layoutService.mainContainer;
419-
this._register(editorGroupsService.getPart(container).onDidScroll(e => {
420-
if (!this._shadowElement || !this._isVisible) {
421-
return;
422-
}
423-
424-
this.layoutContainerOverShadowElement(this._shadowElement);
425-
}));
426419

427420
this.notebookEditorService.addNotebookEditor(this);
428421

src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export class WebviewEditor extends EditorPane {
4040
public static readonly ID = 'WebviewEditor';
4141

4242
private _element?: HTMLElement;
43-
private _dimension?: DOM.Dimension;
4443
private _visible = false;
4544
private _isDisposed = false;
4645
private _clippingContainer?: HTMLElement;
@@ -65,15 +64,6 @@ export class WebviewEditor extends EditorPane {
6564
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
6665
) {
6766
super(WebviewEditor.ID, group, telemetryService, themeService, storageService);
68-
69-
const part = _editorGroupsService.getPart(group);
70-
this._register(Event.any(part.onDidScroll, part.onDidAddGroup, part.onDidRemoveGroup, part.onDidMoveGroup)(() => {
71-
if (this.webview && this._visible) {
72-
this.setWebviewAnchorElement(this.webview);
73-
}
74-
}));
75-
76-
7767
}
7868

7969
private get webview(): IOverlayWebview | undefined {
@@ -103,11 +93,6 @@ export class WebviewEditor extends EditorPane {
10393
}
10494

10595
public override layout(dimension: DOM.Dimension): void {
106-
this._dimension = dimension;
107-
if (this.webview && this._visible) {
108-
this.setWebviewAnchorElement(this.webview);
109-
}
110-
11196
this.setEditorVisible(dimension.width > 0 && dimension.height > 0);
11297
}
11398

@@ -172,9 +157,6 @@ export class WebviewEditor extends EditorPane {
172157
if (!alreadyOwnsWebview) {
173158
this.claimWebview(input);
174159
}
175-
if (this._dimension) {
176-
this.layout(this._dimension);
177-
}
178160
}
179161
}
180162

src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@ export class WebviewViewPane extends ViewPane {
137137
super.saveState();
138138
}
139139

140-
protected override layoutBody(height: number, width: number): void {
141-
super.layoutBody(height, width);
142-
this.layoutWebview();
143-
}
144-
145140
private updateTreeVisibility() {
146141
if (this.isBodyVisible()) {
147142
this.activate();

0 commit comments

Comments
 (0)