From 0be89e9a3b44210243cea75e9abacab2489be714 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 2 Jun 2023 14:02:30 +0200
Subject: [PATCH] Checked tree: Inconsistent hover styles (#184152)

Fixes #183918
---
 .../workbench/browser/parts/views/checkbox.ts | 24 +++++++++++++++----
 .../workbench/browser/parts/views/treeView.ts |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/views/checkbox.ts b/src/vs/workbench/browser/parts/views/checkbox.ts
index b109ec29a0c..f5c3b4241a5 100644
--- a/src/vs/workbench/browser/parts/views/checkbox.ts
+++ b/src/vs/workbench/browser/parts/views/checkbox.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { IHoverDelegate } from 'vs/base/browser/ui/iconLabel/iconHoverDelegate';
+import { ICustomHover, setupCustomHover } from 'vs/base/browser/ui/iconLabel/iconLabelHover';
 import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
 import { Codicon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -25,13 +27,14 @@ export class TreeItemCheckbox extends Disposable {
 	public toggle: Toggle | undefined;
 	private checkboxContainer: HTMLDivElement;
 	public isDisposed = false;
+	private hover: ICustomHover | undefined;
 
 	public static readonly checkboxClass = 'custom-view-tree-node-item-checkbox';
 
 	private readonly _onDidChangeState = new Emitter<boolean>();
 	readonly onDidChangeState: Event<boolean> = this._onDidChangeState.event;
 
-	constructor(container: HTMLElement, private checkboxStateHandler: CheckboxStateHandler) {
+	constructor(container: HTMLElement, private checkboxStateHandler: CheckboxStateHandler, private readonly hoverDelegate: IHoverDelegate) {
 		super();
 		this.checkboxContainer = <HTMLDivElement>container;
 	}
@@ -52,10 +55,11 @@ export class TreeItemCheckbox extends Disposable {
 		if (node.checkbox) {
 			this.toggle = new Toggle({
 				isChecked: node.checkbox.isChecked,
-				title: this.createCheckboxTitle(node.checkbox),
+				title: '',
 				icon: node.checkbox.isChecked ? Codicon.check : undefined,
 				...defaultToggleStyles
 			});
+			this.setHover(node.checkbox);
 			this.setAccessibilityInformation(node.checkbox);
 			this.toggle.domNode.classList.add(TreeItemCheckbox.checkboxClass);
 			DOM.append(this.checkboxContainer, this.toggle.domNode);
@@ -73,17 +77,29 @@ export class TreeItemCheckbox extends Disposable {
 		}
 	}
 
+	private setHover(checkbox: ITreeItemCheckboxState) {
+		if (this.toggle) {
+			if (!this.hover) {
+				this.hover = setupCustomHover(this.hoverDelegate, this.toggle.domNode, this.checkboxHoverContent(checkbox));
+				this._register(this.hover);
+			} else {
+				this.hover.update(checkbox.tooltip);
+			}
+		}
+	}
+
 	private setCheckbox(node: ITreeItem) {
 		if (this.toggle && node.checkbox) {
 			node.checkbox.isChecked = this.toggle.checked;
 			this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
-			this.toggle.setTitle(this.createCheckboxTitle(node.checkbox));
+			this.setHover(node.checkbox);
+
 			this.setAccessibilityInformation(node.checkbox);
 			this.checkboxStateHandler.setCheckboxState(node);
 		}
 	}
 
-	private createCheckboxTitle(checkbox: ITreeItemCheckboxState) {
+	private checkboxHoverContent(checkbox: ITreeItemCheckboxState): string {
 		return checkbox.tooltip ? checkbox.tooltip :
 			checkbox.isChecked ? localize('checked', 'Checked') : localize('unchecked', 'Unchecked');
 	}
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index e9269419448..f66d9bddaab 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -1316,7 +1316,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 				this.rerender();
 			}
 			if (!templateData.checkbox) {
-				const checkbox = new TreeItemCheckbox(templateData.checkboxContainer, this.checkboxStateHandler);
+				const checkbox = new TreeItemCheckbox(templateData.checkboxContainer, this.checkboxStateHandler, this._hoverDelegate);
 				templateData.checkbox = checkbox;
 			}
 			templateData.checkbox.render(node);