mirror of
https://github.com/Microsoft/vscode
synced 2024-10-12 06:17:18 +00:00
setting the sticky scroll to be disabled when inside of an inline diff
This commit is contained in:
parent
374e02fda2
commit
54cec36d55
|
@ -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: {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue