Skip to content

Commit a2516df

Browse files
authored
Merge pull request #197270 from microsoft/merogge/activity-bar
show activity bar item tooltip on keyboard focus
2 parents 6382347 + 8a97792 commit a2516df

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/vs/base/browser/ui/actionbar/actionbar.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export interface IActionViewItem extends IDisposable {
2222
isEnabled(): boolean;
2323
focus(fromRight?: boolean): void; // TODO@isidorn what is this?
2424
blur(): void;
25+
showHover?(): void;
2526
}
2627

2728
export interface IActionViewItemProvider {
@@ -282,6 +283,7 @@ export class ActionBar extends Disposable implements IActionRunner {
282283
const elem = this.actionsList.children[i];
283284
if (DOM.isAncestor(DOM.getActiveElement(), elem)) {
284285
this.focusedItem = i;
286+
this.viewItems[this.focusedItem]?.showHover?.();
285287
break;
286288
}
287289
}
@@ -544,8 +546,7 @@ export class ActionBar extends Disposable implements IActionRunner {
544546
if (this.previouslyFocusedItem !== undefined && this.previouslyFocusedItem !== this.focusedItem) {
545547
this.viewItems[this.previouslyFocusedItem]?.blur();
546548
}
547-
548-
const actionViewItem = this.focusedItem !== undefined && this.viewItems[this.focusedItem];
549+
const actionViewItem = this.focusedItem !== undefined ? this.viewItems[this.focusedItem] : undefined;
549550
if (actionViewItem) {
550551
let focusItem = true;
551552

@@ -560,7 +561,9 @@ export class ActionBar extends Disposable implements IActionRunner {
560561
if (actionViewItem.action.id === Separator.ID) {
561562
focusItem = false;
562563
}
563-
564+
if (focusItem) {
565+
actionViewItem.showHover?.();
566+
}
564567
if (!focusItem) {
565568
this.actionsList.focus({ preventScroll });
566569
this.previouslyFocusedItem = undefined;

src/vs/workbench/browser/parts/compositeBarActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ export class CompoisteBarActionViewItem extends BaseActionViewItem {
415415
}));
416416
}
417417

418-
private showHover(skipFadeInAnimation: boolean = false): void {
418+
showHover(skipFadeInAnimation: boolean = false): void {
419419
if (this.lastHover && !this.lastHover.isDisposed) {
420420
return;
421421
}

0 commit comments

Comments
 (0)