development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 14:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

setting the sticky scroll to be disabled when inside of an inline diff

Browse source
This commit is contained in:
Aiday Marlen Kyzy 2023-06-01 15:25:52 +02:00
parent 374e02fda2
commit 54cec36d55
No known key found for this signature in database
GPG key ID: 24A8B53DBD26FF4E
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/browser/widget/diffEditorWidget.ts
View file

@ -1287,6 +1287,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
// never wrap hidden editor
result.wordWrapOverride1 = 'off';
result.wordWrapOverride2 = 'off';
result.stickyScroll = { enabled: false };
} else {
result.wordWrapOverride1 = this._options.diffWordWrap;
}
@ -1297,7 +1298,6 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
result.readOnly = !this._options.originalEditable;
result.dropIntoEditor = { enabled: !result.readOnly };
result.extraEditorClassName = 'original-in-monaco-diff-editor';
result.stickyScroll = { enabled: false };
return {
...result,
dimension: {

2
src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
View file

@ -281,6 +281,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
// never wrap hidden editor
result.wordWrapOverride1 = 'off';
result.wordWrapOverride2 = 'off';
result.stickyScroll = { enabled: false };
} else {
result.wordWrapOverride1 = this._options.get().diffWordWrap;
}
@ -291,7 +292,6 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
result.readOnly = !options.originalEditable;
result.dropIntoEditor = { enabled: !result.readOnly };
result.extraEditorClassName = 'original-in-monaco-diff-editor';
result.stickyScroll = { enabled: false };
return result;
}