development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-render sticky scroll when line numbers display mode is changed (#210815)

Browse source 
* re-render when line numbers display is changed

* refactor: extract to _readConfigurationChange
This commit is contained in:
Timothy Ng 2024-04-23 00:37:09 -07:00 committed by GitHub
parent 05e0576b6e
commit 386e1cf0bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
View file

@ -7,7 +7,7 @@ import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecy
import { IActiveCodeEditor, ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
import { EditorOption, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
import { EditorOption, RenderLineNumbersType, ConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget';
import { IStickyLineCandidateProvider, StickyLineCandidateProvider } from './stickyScrollProvider';
import { IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
@ -89,14 +89,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
this._readConfiguration();
const stickyScrollDomNode = this._stickyScrollWidget.getDomNode();
this._register(this._editor.onDidChangeConfiguration(e => {
if (
e.hasChanged(EditorOption.stickyScroll)
|| e.hasChanged(EditorOption.minimap)
|| e.hasChanged(EditorOption.lineHeight)
|| e.hasChanged(EditorOption.showFoldingControls)
) {
this._readConfiguration();
}
this._readConfigurationChange(e);
}));
this._register(dom.addDisposableListener(stickyScrollDomNode, dom.EventType.CONTEXT_MENU, async (event: MouseEvent) => {
this._onContextMenu(dom.getWindow(stickyScrollDomNode), event);
@ -444,6 +437,22 @@ export class StickyScrollController extends Disposable implements IEditorContrib
}
}
private _readConfigurationChange(event: ConfigurationChangedEvent) {
if (
event.hasChanged(EditorOption.stickyScroll)
|| event.hasChanged(EditorOption.minimap)
|| event.hasChanged(EditorOption.lineHeight)
|| event.hasChanged(EditorOption.showFoldingControls)
|| event.hasChanged(EditorOption.lineNumbers)
) {
this._readConfiguration();
}
if (event.hasChanged(EditorOption.lineNumbers)) {
this._renderStickyScroll(0);
}
}
private _needsUpdate(event: IModelTokensChangedEvent) {
const stickyLineNumbers = this._stickyScrollWidget.getCurrentLines();
for (const stickyLineNumber of stickyLineNumbers) {