Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add border to status bar items on keyboard focus #142665

Merged
merged 8 commits into from Feb 11, 2022
Merged

Add border to status bar items on keyboard focus #142665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52559c4
Add outline to items on :focus-visible
daviddossett Feb 9, 2022
44a1ac5
Merge branch 'main' into ddossett/status-bar-item-focus
daviddossett Feb 9, 2022
0b15936
Add offset
daviddossett Feb 9, 2022
986f99c
Update comments
daviddossett Feb 9, 2022
9dfd052
Clean up outline logic
daviddossett Feb 9, 2022
d96d54e
Merge branch 'main' into ddossett/status-bar-item-focus
daviddossett Feb 9, 2022
012a5d7
Add status bar item focus token
daviddossett Feb 10, 2022
3faec6a
Merge branch 'main' into ddossett/status-bar-item-focus
daviddossett Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntry
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IAction, Separator, toAction } from 'vs/base/common/actions';
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND } from 'vs/workbench/common/theme';
import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER } from 'vs/workbench/common/theme';
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
import { contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
import { EventHelper, createStyleSheet, addDisposableListener, EventType, clearNode } from 'vs/base/browser/dom';
Expand Down Expand Up @@ -502,10 +502,12 @@ export class StatusbarPart extends Part implements IStatusbarService {
const container = assertIsDefined(this.getContainer());
const styleOverride: IStatusbarStyleOverride | undefined = [...this.styleOverrides].sort((a, b) => a.priority - b.priority)[0];

// Background colors
// Background / foreground colors
const backgroundColor = this.getColor(styleOverride?.background ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND)) || '';
container.style.backgroundColor = backgroundColor;
container.style.color = this.getColor(styleOverride?.foreground ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND)) || '';
const foregroundColor = this.getColor(styleOverride?.foreground ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND)) || '';
container.style.color = foregroundColor;
daviddossett marked this conversation as resolved.
Show resolved Hide resolved
const itemBorderColor = this.getColor(STATUS_BAR_ITEM_FOCUS_BORDER);

// Border color
const borderColor = this.getColor(styleOverride?.border ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BORDER : STATUS_BAR_NO_FOLDER_BORDER)) || this.getColor(contrastBorder);
Expand All @@ -517,12 +519,23 @@ export class StatusbarPart extends Part implements IStatusbarService {
container.style.removeProperty('--status-border-top-color');
}

// Notification Beak
// Colors and focus outlines via dynamic stylesheet

if (!this.styleElement) {
this.styleElement = createStyleSheet(container);
}

this.styleElement.textContent = `.monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak:before { border-bottom-color: ${backgroundColor}; }`;
this.styleElement.textContent = `
/* Focus outline */
.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:focus-visible:not(.disabled) {
outline: 1px solid ${this.getColor(activeContrastBorder) ?? itemBorderColor};
outline-offset: ${borderColor ? '-2px' : '-1px'};
}
/* Notification Beak */
.monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak:before {
border-bottom-color: ${backgroundColor};
}
`;
}

override layout(width: number, height: number, top: number, left: number): void {
Expand Down Expand Up @@ -552,7 +565,6 @@ registerThemingParticipant((theme, collector) => {
const statusBarItemHoverBackground = theme.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
if (statusBarItemHoverBackground) {
collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) { background-color: ${statusBarItemHoverBackground}; }`);
collector.addRule(`.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:focus:not(.disabled) { background-color: ${statusBarItemHoverBackground}; }`);
}

const statusBarItemActiveBackground = theme.getColor(STATUS_BAR_ITEM_ACTIVE_BACKGROUND);
Expand All @@ -565,7 +577,6 @@ registerThemingParticipant((theme, collector) => {
const activeContrastBorderColor = theme.getColor(activeContrastBorder);
if (activeContrastBorderColor) {
collector.addRule(`
.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:focus:not(.disabled),
.monaco-workbench .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
outline: 1px solid ${activeContrastBorderColor} !important;
outline-offset: -1px;
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/common/theme.ts
View file
Open in desktop
Expand Up @@ -394,6 +394,12 @@ export const STATUS_BAR_ITEM_ACTIVE_BACKGROUND = registerColor('statusBarItem.ac
hc: Color.white.transparent(0.18)
}, localize('statusBarItemActiveBackground', "Status bar item background color when clicking. The status bar is shown in the bottom of the window."));

export const STATUS_BAR_ITEM_FOCUS_BORDER = registerColor('statusBarItem.focusBorder', {
dark: STATUS_BAR_FOREGROUND,
light: STATUS_BAR_FOREGROUND,
hc: null,
}, localize('statusBarItemFocusBorder', "Status bar item border color when focused on keyboard navigation. The status bar is shown in the bottom of the window."));

export const STATUS_BAR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.hoverBackground', {
dark: Color.white.transparent(0.12),
light: Color.white.transparent(0.12),
Expand Down