maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix https://github.com/microsoft/vscode/issues/123570

Browse source
This commit is contained in:
Johannes Rieken 2021-05-28 10:17:31 +02:00
parent 3ac57c7132
commit d5c73cc952
No known key found for this signature in database
GPG key ID: 96634B5AF12F8798
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vs/workbench/services/decorations/browser/decorationsService.ts
View file

@ -75,12 +75,9 @@ class DecorationRule {
const { color, letter } = data;
// label
createCSSRule(`.${this.itemColorClassName}`, `color: ${getColor(theme, color)};`, element);
// icon
if (ThemeIcon.isThemeIcon(letter)) {
this._createIconCSSRule(letter, color, element, theme);
}
// letter
else if (letter) {
} else if (letter) {
createCSSRule(`.${this.itemBadgeClassName}::after`, `content: "${letter}"; color: ${getColor(theme, color)};`, element);
}
}
@ -93,6 +90,7 @@ class DecorationRule {
// icon (only show first)
const icon = data.find(d => ThemeIcon.isThemeIcon(d.letter))?.letter as ThemeIcon | undefined;
if (icon) {
// todo@jrieken this is fishy. icons should be just like letter and not mute bubble badge
this._createIconCSSRule(icon, color, element, theme);
} else {
// badge
@ -112,14 +110,26 @@ class DecorationRule {
}
private _createIconCSSRule(icon: ThemeIcon, color: string | undefined, element: HTMLStyleElement, theme: IColorTheme) {
const codicon = iconRegistry.get(icon.id);
const index = icon.id.lastIndexOf('~');
const id = index < 0 ? icon.id : icon.id.substr(0, index);
const modifier = index < 0 ? '' : icon.id.substr(index + 1);
const codicon = iconRegistry.get(id);
if (!codicon || !('fontCharacter' in codicon.definition)) {
return;
}
const charCode = parseInt(codicon.definition.fontCharacter.substr(1), 16);
createCSSRule(
`.${this.iconBadgeClassName}::after`,
`content: "${String.fromCharCode(charCode)}"; color: ${getColor(theme, color)}; font-family: codicon; font-size: 16px; padding-right: 14px; font-weight: normal`,
`content: "${String.fromCharCode(charCode)}";
color: ${getColor(theme, color)};
font-family: codicon;
font-size: 16px;
padding-right: 14px;
font-weight: normal;
${modifier === 'spin' ? 'animation: codicon-spin 1.5s steps(30) infinite' : ''};
`,
element
);
}