diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.ts index ff39395534f..6f87a277c59 100644 --- a/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.ts +++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.ts @@ -33,6 +33,8 @@ import { alert } from 'vs/base/browser/ui/aria/aria'; import { AccessibilityHelpAction, AccessibleViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions'; import { IAction } from 'vs/base/common/actions'; import { INotificationViewItem } from 'vs/workbench/common/notifications'; +import { ThemeIcon } from 'vs/base/common/themables'; +import { Codicon } from 'vs/base/common/codicons'; export class EditorAccessibilityHelpContribution extends Disposable { static ID: 'editorAccessibilityHelpContribution'; @@ -245,6 +247,7 @@ function getActionsFromNotification(notification: INotificationViewItem): IActio } if (actions) { for (const action of actions) { + action.class = ThemeIcon.asClassName(Codicon.bell); const initialAction = action.run; action.run = () => { initialAction(); @@ -253,7 +256,7 @@ function getActionsFromNotification(notification: INotificationViewItem): IActio } } if (actions) { - actions.push({ id: 'clearNotification', label: localize('clearNotification', "Clear Notification"), tooltip: localize('clearNotification', "Clear Notification"), run: () => notification.close(), enabled: true, class: 'codicon codicon-clear-all' }); + actions.push({ id: 'clearNotification', label: localize('clearNotification', "Clear Notification"), tooltip: localize('clearNotification', "Clear Notification"), run: () => notification.close(), enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll) }); } return actions; } diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts index b5a2f862a49..b70d28fe80f 100644 --- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts +++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts @@ -36,6 +36,8 @@ import { AccessibilityVerbositySettingId, accessibilityHelpIsShown, accessibleVi import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions'; import { IAction } from 'vs/base/common/actions'; import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; +import { Codicon } from 'vs/base/common/codicons'; +import { ThemeIcon } from 'vs/base/common/themables'; const enum DIMENSIONS { MAX_WIDTH = 600 @@ -44,6 +46,10 @@ const enum DIMENSIONS { export interface IAccessibleContentProvider { verbositySettingKey: AccessibilityVerbositySettingId; options: IAccessibleViewOptions; + /** + * Note that the class property should be provided. + * If not, a default Codicon will be used. + */ actions?: IAction[]; provideContent(): string; onClose(): void; @@ -356,7 +362,7 @@ class AccessibleView extends Disposable { createAndFillInActionBarActions(toolbarMenu, {}, menuActions); if (providedActions) { for (const providedAction of providedActions) { - providedAction.class = 'codicon codicon-primitive-square'; + providedAction.class = providedAction.class || ThemeIcon.asClassName(Codicon.primitiveSquare); providedAction.checked = undefined; } this._toolbar.setActions([...providedActions, ...menuActions]);