提交 874c98d8 编写于 作者: A Alex Ross

Always use new hover in custom tree views

上级 d82329c5
......@@ -766,7 +766,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
const fileDecorations = this.configurationService.getValue<{ colors: boolean, badges: boolean }>('explorer.decorations');
templateData.resourceLabel.setResource({ name: label, description, resource: resource ? resource : URI.parse('missing:_icon_resource') }, {
fileKind: this.getFileKind(node),
title,
title: undefined,
hideIcon: !!iconUrl,
fileDecorations,
extraClasses: ['custom-view-tree-node-item-resourceLabel'],
......@@ -775,7 +775,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
});
} else {
templateData.resourceLabel.setResource({ name: label, description }, {
title,
title: undefined,
hideIcon: true,
extraClasses: ['custom-view-tree-node-item-resourceLabel'],
matches: matches ? matches : createMatches(element.filterData),
......@@ -811,10 +811,6 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
}
private setupHovers(node: ITreeItem, htmlElement: HTMLElement, disposableStore: DisposableStore, label: string | undefined): void {
if (!(node instanceof ResolvableTreeItem) || (node.tooltip && isString(node.tooltip)) || (!node.tooltip && !node.hasResolve)) {
return;
}
const resolvableNode: ResolvableTreeItem = node;
const hoverService = this.hoverService;
const hoverDelay = this.hoverDelay;
let hoverOptions: IHoverOptions | undefined;
......@@ -825,8 +821,10 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
}
this.addEventListener(DOM.EventType.MOUSE_LEAVE, mouseLeave, { passive: true });
setTimeout(async () => {
await resolvableNode.resolve();
const tooltip = resolvableNode.tooltip ?? label;
if (node instanceof ResolvableTreeItem) {
await node.resolve();
}
const tooltip = node.tooltip ?? label;
if (isHovering && tooltip) {
if (!hoverOptions) {
const target: IHoverTarget = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册