Skip to content

Commit

Permalink
fix: update
Browse files Browse the repository at this point in the history
  • Loading branch information
Loïc Mangeonjean committed Feb 26, 2024
1 parent 81a1b73 commit fc1ed50
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 5 deletions.
14 changes: 13 additions & 1 deletion demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion scripts/vscode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2691,7 +2691,7 @@ index 6e6f8845da5..f4824f99f9f 100644
onTerminate = (reason: string) => extHostMain.terminate(reason);
});
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index ccdbaf9d6bd..77e894faf5c 100644
index ccdbaf9d6bd..8a1f6e23c77 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -52,7 +52,7 @@ import { CustomTitleBarVisibility } from '../../platform/window/common/window';
Expand Down Expand Up @@ -2732,6 +2732,15 @@ index ccdbaf9d6bd..77e894faf5c 100644
readonly filesToOpenOrCreate?: IPathToOpen[];
readonly filesToDiff?: IPathToOpen[];
readonly filesToMerge?: IPathToOpen[];
@@ -1615,7 +1615,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi

layout(): void {
if (!this.disposed) {
- this._mainContainerDimension = getClientArea(this.parent);
+ this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen ? mainWindow.document.body : this.parent);
this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`);

position(this.mainContainer, 0, 0, 0, 0, 'relative');
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 262745f0ed2..109419c2b55 100644
--- a/src/vs/workbench/browser/media/style.css
Expand Down
21 changes: 18 additions & 3 deletions src/service-override/tools/views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type Label = string | {

abstract class SimpleEditorPane extends EditorPane {
protected container!: HTMLElement
protected wrapper!: HTMLElement
private scrollbar: DomScrollableElement | undefined
private inputDisposable = this._register(new MutableDisposable())
constructor (
Expand All @@ -59,9 +60,22 @@ abstract class SimpleEditorPane extends EditorPane {
protected override createEditor (parent: HTMLElement): void {
this.container = this.initialize()

this.wrapper = document.createElement('div')
this.wrapper.append(this.container)

// Custom Scrollbars
this.scrollbar = this._register(new DomScrollableElement(this.container, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }))
this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }))
parent.appendChild(this.scrollbar.getDomNode())

const observer = new ResizeObserver(() => {
assertIsDefined(this.scrollbar).scanDomNode()
})
observer.observe(this.container)
this._register({
dispose () {
observer.disconnect()
}
})
}

override async setInput (input: EditorInput, editorOptions: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
Expand All @@ -73,13 +87,14 @@ abstract class SimpleEditorPane extends EditorPane {
}

this.inputDisposable.value = await this.renderInput?.(input, editorOptions, context, token)
assertIsDefined(this.scrollbar).scanDomNode()
}

override layout (dimension: Dimension): void {
const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar)
const [wrapper, scrollbar] = assertAllDefined(this.wrapper, this.scrollbar)

// Pass on to Container
size(container, dimension.width, dimension.height)
size(wrapper, dimension.width, dimension.height)

// Adjust scrollbar
scrollbar.scanDomNode()
Expand Down

0 comments on commit fc1ed50

Please sign in to comment.