Merge pull request #4073 from Tyriar/4072
Show entire glyph for extra powerline symbols
This commit is contained in:
@@ -13,7 +13,7 @@ import { IDisposable } from 'xterm';
|
|||||||
import { AttributeData } from 'common/buffer/AttributeData';
|
import { AttributeData } from 'common/buffer/AttributeData';
|
||||||
import { color, rgba } from 'common/Color';
|
import { color, rgba } from 'common/Color';
|
||||||
import { tryDrawCustomChar } from 'browser/renderer/CustomGlyphs';
|
import { tryDrawCustomChar } from 'browser/renderer/CustomGlyphs';
|
||||||
import { excludeFromContrastRatioDemands, isPowerlineGlyph } from 'browser/renderer/RendererUtils';
|
import { excludeFromContrastRatioDemands, isPowerlineGlyph, isRestrictedPowerlineGlyph } from 'browser/renderer/RendererUtils';
|
||||||
|
|
||||||
// For debugging purposes, it can be useful to set this to a really tiny value,
|
// For debugging purposes, it can be useful to set this to a really tiny value,
|
||||||
// to verify that LRU eviction works.
|
// to verify that LRU eviction works.
|
||||||
@@ -418,6 +418,7 @@ export class WebglCharAtlas implements IDisposable {
|
|||||||
this._tmpCtx.textBaseline = TEXT_BASELINE;
|
this._tmpCtx.textBaseline = TEXT_BASELINE;
|
||||||
|
|
||||||
const powerlineGlyph = chars.length === 1 && isPowerlineGlyph(chars.charCodeAt(0));
|
const powerlineGlyph = chars.length === 1 && isPowerlineGlyph(chars.charCodeAt(0));
|
||||||
|
const restrictedPowerlineGlyph = chars.length === 1 && isRestrictedPowerlineGlyph(chars.charCodeAt(0));
|
||||||
const foregroundColor = this._getForegroundColor(bg, bgColorMode, bgColor, fg, fgColorMode, fgColor, inverse, dim, bold, excludeFromContrastRatioDemands(chars.charCodeAt(0)));
|
const foregroundColor = this._getForegroundColor(bg, bgColorMode, bgColor, fg, fgColorMode, fgColor, inverse, dim, bold, excludeFromContrastRatioDemands(chars.charCodeAt(0)));
|
||||||
this._tmpCtx.fillStyle = foregroundColor.css;
|
this._tmpCtx.fillStyle = foregroundColor.css;
|
||||||
|
|
||||||
@@ -606,7 +607,7 @@ export class WebglCharAtlas implements IDisposable {
|
|||||||
return NULL_RASTERIZED_GLYPH;
|
return NULL_RASTERIZED_GLYPH;
|
||||||
}
|
}
|
||||||
|
|
||||||
const rasterizedGlyph = this._findGlyphBoundingBox(imageData, this._workBoundingBox, allowedWidth, powerlineGlyph, customGlyph, padding);
|
const rasterizedGlyph = this._findGlyphBoundingBox(imageData, this._workBoundingBox, allowedWidth, restrictedPowerlineGlyph, customGlyph, padding);
|
||||||
const clippedImageData = this._clipImageData(imageData, this._workBoundingBox);
|
const clippedImageData = this._clipImageData(imageData, this._workBoundingBox);
|
||||||
|
|
||||||
// Find the best atlas row to use
|
// Find the best atlas row to use
|
||||||
|
|||||||
@@ -14,11 +14,15 @@ export function isPowerlineGlyph(codepoint: number): boolean {
|
|||||||
// Only return true for Powerline symbols which require
|
// Only return true for Powerline symbols which require
|
||||||
// different padding and should be excluded from minimum contrast
|
// different padding and should be excluded from minimum contrast
|
||||||
// ratio standards
|
// ratio standards
|
||||||
return 0xE0A4 <= codepoint && codepoint <= 0xE0D6;
|
return 0xE0A4 <= codepoint && codepoint <= 0xE0D6;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isRestrictedPowerlineGlyph(codepoint: number): boolean {
|
||||||
|
return 0xE0B0 <= codepoint && codepoint <= 0xE0B7;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isBoxOrBlockGlyph(codepoint: number): boolean {
|
function isBoxOrBlockGlyph(codepoint: number): boolean {
|
||||||
return (0x2500 <= codepoint && codepoint <= 0x259F);
|
return 0x2500 <= codepoint && codepoint <= 0x259F;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function excludeFromContrastRatioDemands(codepoint: number): boolean {
|
export function excludeFromContrastRatioDemands(codepoint: number): boolean {
|
||||||
|
|||||||
Reference in New Issue
Block a user