Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not render synchronously when restoring the state, the desired scrollLeft is maintained even if the scrollWidth is small #165193

Merged
merged 1 commit into from
Nov 1, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/vs/editor/browser/view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,11 @@ export class View extends ViewEventHandler {
}

public restoreState(scrollPosition: { scrollLeft: number; scrollTop: number }): void {
this._context.viewModel.viewLayout.setScrollPosition({ scrollTop: scrollPosition.scrollTop }, ScrollType.Immediate);
this._context.viewModel.viewLayout.setScrollPosition({
scrollTop: scrollPosition.scrollTop,
scrollLeft: scrollPosition.scrollLeft
}, ScrollType.Immediate);
this._context.viewModel.tokenizeViewport();
this._renderNow();
this._viewLines.updateLineWidths();
this._context.viewModel.viewLayout.setScrollPosition({ scrollLeft: scrollPosition.scrollLeft }, ScrollType.Immediate);
}

public getOffsetForColumn(modelLineNumber: number, modelColumn: number): number {
Expand Down