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

Fix hovers on empty group watermarks (#212777)

Browse source 
fixes #212355
This commit is contained in:
Benjamin Christopher Simmonds 2024-05-15 09:42:20 +02:00 committed by GitHub
parent 7680db2a11
commit 6ade685193
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
View file

@ -62,7 +62,7 @@ export class EditorGroupWatermark extends Disposable {
private readonly transientDisposables = this._register(new DisposableStore());
private enabled: boolean = false;
private workbenchState: WorkbenchState;
private keybindingLabel?: KeybindingLabel;
private keybindingLabels = new Set<KeybindingLabel>();
constructor(
container: HTMLElement,
@ -137,6 +137,9 @@ export class EditorGroupWatermark extends Disposable {
const update = () => {
clearNode(box);
this.keybindingLabels.forEach(label => label.dispose());
this.keybindingLabels.clear();
for (const entry of selected) {
const keys = this.keybindingService.lookupKeybinding(entry.id);
if (!keys) {
@ -146,9 +149,9 @@ export class EditorGroupWatermark extends Disposable {
const dt = append(dl, $('dt'));
dt.textContent = entry.text;
const dd = append(dl, $('dd'));
this.keybindingLabel?.dispose();
this.keybindingLabel = new KeybindingLabel(dd, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles });
this.keybindingLabel.set(keys);
const label = new KeybindingLabel(dd, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles });
label.set(keys);
this.keybindingLabels.add(label);
}
};
@ -164,6 +167,6 @@ export class EditorGroupWatermark extends Disposable {
override dispose(): void {
super.dispose();
this.clear();
this.keybindingLabel?.dispose();
this.keybindingLabels.forEach(label => label.dispose());
}
}