development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - fix input flickering (#183440)

Browse source
This commit is contained in:
Ladislau Szomoru 2023-05-25 16:56:05 +02:00 committed by GitHub
parent 97762b52c8
commit 52e56ad19a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
View file

@ -224,6 +224,7 @@ class SCMTreeDragAndDrop implements ITreeDragAndDrop<TreeElement> {
interface InputTemplate {
readonly inputWidget: SCMInputWidget;
inputWidgetHeight: number;
readonly elementDisposables: DisposableStore;
readonly templateDisposable: IDisposable;
}
@ -258,7 +259,7 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
const inputWidget = this.instantiationService.createInstance(SCMInputWidget, inputElement, this.overflowWidgetsDomNode);
templateDisposable.add(inputWidget);
return { inputWidget, elementDisposables: new DisposableStore(), templateDisposable };
return { inputWidget, inputWidgetHeight: InputRenderer.DEFAULT_HEIGHT, elementDisposables: new DisposableStore(), templateDisposable };
}
renderElement(node: ITreeNode<ISCMInput, FuzzyScore>, index: number, templateData: InputTemplate): void {
@ -268,10 +269,7 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
// Remember widget
this.inputWidgets.set(input, templateData.inputWidget);
templateData.elementDisposables.add({
dispose: () => {
this.inputWidgets.delete(input);
this.contentHeights.delete(input);
}
dispose: () => this.inputWidgets.delete(input)
});
// Widget cursor selections
@ -292,11 +290,11 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
// Rerender the element whenever the editor content height changes
const onDidChangeContentHeight = () => {
const contentHeight = templateData.inputWidget.getContentHeight();
const lastContentHeight = this.contentHeights.get(input)!;
this.contentHeights.set(input, contentHeight);
if (lastContentHeight !== contentHeight) {
if (templateData.inputWidgetHeight !== contentHeight) {
this.updateHeight(input, contentHeight + 10);
templateData.inputWidgetHeight = contentHeight;
templateData.inputWidget.layout();
}
};