Fix context menu with hover (#174597)

microsoft · Feb 16, 2023 · 524f422 · 524f422
1 parent 3bc8407
commit 524f422
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts b/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts
@@ -164,6 +164,7 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM
 	let hoverWidget: UpdatableHoverWidget | undefined;
 
 	const hideHover = (disposeWidget: boolean, disposePreparation: boolean) => {
+		const hadHover = hoverWidget !== undefined;
 		if (disposeWidget) {
 			hoverWidget?.dispose();
 			hoverWidget = undefined;
@@ -172,7 +173,9 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM
 			hoverPreparation?.dispose();
 			hoverPreparation = undefined;
 		}
-		hoverDelegate.onDidHideHover?.();
+		if (hadHover) {
+			hoverDelegate.onDidHideHover?.();
+		}
 	};
 
 	const triggerShowHover = (delay: number, focus?: boolean, target?: IHoverDelegateTarget) => {

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -285,7 +285,7 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 
 		get delay() {
 			// Delay implementation borrowed froms src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
-			if (Date.now() - this.lastHoverHideTime < 200) {
+			if (Date.now() - this.lastHoverHideTime < 500) {
 				return 0; // show instantly when a hover was recently shown
 			}
 
@@ -317,7 +317,8 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 				overflowed = width <= childWidth;
 			}
 
-			const hasDecoration = element.classList.toString().includes('monaco-decoration-iconBadge');
+			// Only count decorations that provide additional info, as hover overing decorations such as git excluded isn't helpful
+			const hasDecoration = options.content.toString().includes('•');
 			// If it's overflowing or has a decoration show the tooltip
 			overflowed = overflowed || hasDecoration;
 
@@ -330,6 +331,7 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 				...options,
 				target: indentGuideElement,
 				compact: true,
+				container: row,
 				additionalClasses: ['explorer-item-hover'],
 				skipFadeInAnimation: true,
 				showPointer: false,