Set text baseline conditionally by browser.
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { ICharAtlasConfig } from './Types';
|
import { ICharAtlasConfig } from './Types';
|
||||||
import { DIM_OPACITY } from 'browser/renderer/atlas/Constants';
|
import { DIM_OPACITY, TEXT_BASELINE } from 'browser/renderer/atlas/Constants';
|
||||||
import { IRasterizedGlyph, IBoundingBox, IRasterizedGlyphSet } from '../Types';
|
import { IRasterizedGlyph, IBoundingBox, IRasterizedGlyphSet } from '../Types';
|
||||||
import { DEFAULT_COLOR, Attributes } from 'common/buffer/Constants';
|
import { DEFAULT_COLOR, Attributes } from 'common/buffer/Constants';
|
||||||
import { throwIfFalsy } from '../WebglUtils';
|
import { throwIfFalsy } from '../WebglUtils';
|
||||||
@@ -368,7 +368,7 @@ export class WebglCharAtlas implements IDisposable {
|
|||||||
const fontStyle = italic ? 'italic' : '';
|
const fontStyle = italic ? 'italic' : '';
|
||||||
this._tmpCtx.font =
|
this._tmpCtx.font =
|
||||||
`${fontStyle} ${fontWeight} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`;
|
`${fontStyle} ${fontWeight} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`;
|
||||||
this._tmpCtx.textBaseline = 'ideographic';
|
this._tmpCtx.textBaseline = TEXT_BASELINE;
|
||||||
|
|
||||||
this._tmpCtx.fillStyle = this._getForegroundCss(bg, bgColorMode, bgColor, fg, fgColorMode, fgColor, inverse, bold);
|
this._tmpCtx.fillStyle = this._getForegroundCss(bg, bgColorMode, bgColor, fg, fgColorMode, fgColor, inverse, bold);
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { IRenderLayer } from './Types';
|
|||||||
import { acquireCharAtlas } from '../atlas/CharAtlasCache';
|
import { acquireCharAtlas } from '../atlas/CharAtlasCache';
|
||||||
import { Terminal } from 'xterm';
|
import { Terminal } from 'xterm';
|
||||||
import { IColorSet } from 'browser/Types';
|
import { IColorSet } from 'browser/Types';
|
||||||
|
import { TEXT_BASELINE } from 'browser/renderer/atlas/Constants';
|
||||||
import { IRenderDimensions } from 'browser/renderer/Types';
|
import { IRenderDimensions } from 'browser/renderer/Types';
|
||||||
import { CellData } from 'common/buffer/CellData';
|
import { CellData } from 'common/buffer/CellData';
|
||||||
import { WebglCharAtlas } from 'atlas/WebglCharAtlas';
|
import { WebglCharAtlas } from 'atlas/WebglCharAtlas';
|
||||||
@@ -224,7 +225,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
*/
|
*/
|
||||||
protected _fillCharTrueColor(terminal: Terminal, cell: CellData, x: number, y: number): void {
|
protected _fillCharTrueColor(terminal: Terminal, cell: CellData, x: number, y: number): void {
|
||||||
this._ctx.font = this._getFont(terminal, false, false);
|
this._ctx.font = this._getFont(terminal, false, false);
|
||||||
this._ctx.textBaseline = 'ideographic';
|
this._ctx.textBaseline = TEXT_BASELINE;
|
||||||
this._clipRow(terminal, y);
|
this._clipRow(terminal, y);
|
||||||
this._ctx.fillText(
|
this._ctx.fillText(
|
||||||
cell.getChars(),
|
cell.getChars(),
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { IRenderDimensions, IRenderLayer } from 'browser/renderer/Types';
|
|||||||
import { ICellData } from 'common/Types';
|
import { ICellData } from 'common/Types';
|
||||||
import { DEFAULT_COLOR, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, Attributes } from 'common/buffer/Constants';
|
import { DEFAULT_COLOR, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, Attributes } from 'common/buffer/Constants';
|
||||||
import { IGlyphIdentifier } from 'browser/renderer/atlas/Types';
|
import { IGlyphIdentifier } from 'browser/renderer/atlas/Types';
|
||||||
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, TEXT_BASELINE } from 'browser/renderer/atlas/Constants';
|
||||||
import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
|
import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
|
||||||
import { acquireCharAtlas } from 'browser/renderer/atlas/CharAtlasCache';
|
import { acquireCharAtlas } from 'browser/renderer/atlas/CharAtlasCache';
|
||||||
import { AttributeData } from 'common/buffer/AttributeData';
|
import { AttributeData } from 'common/buffer/AttributeData';
|
||||||
@@ -262,7 +262,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
*/
|
*/
|
||||||
protected _fillCharTrueColor(cell: CellData, x: number, y: number): void {
|
protected _fillCharTrueColor(cell: CellData, x: number, y: number): void {
|
||||||
this._ctx.font = this._getFont(false, false);
|
this._ctx.font = this._getFont(false, false);
|
||||||
this._ctx.textBaseline = 'ideographic';
|
this._ctx.textBaseline = TEXT_BASELINE;
|
||||||
this._clipRow(y);
|
this._clipRow(y);
|
||||||
|
|
||||||
// Draw custom characters if applicable
|
// Draw custom characters if applicable
|
||||||
@@ -350,7 +350,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
private _drawUncachedChars(cell: ICellData, x: number, y: number, fgOverride?: IColor): void {
|
private _drawUncachedChars(cell: ICellData, x: number, y: number, fgOverride?: IColor): void {
|
||||||
this._ctx.save();
|
this._ctx.save();
|
||||||
this._ctx.font = this._getFont(!!cell.isBold(), !!cell.isItalic());
|
this._ctx.font = this._getFont(!!cell.isBold(), !!cell.isItalic());
|
||||||
this._ctx.textBaseline = 'ideographic';
|
this._ctx.textBaseline = TEXT_BASELINE;
|
||||||
|
|
||||||
if (cell.isInverse()) {
|
if (cell.isInverse()) {
|
||||||
if (fgOverride) {
|
if (fgOverride) {
|
||||||
|
|||||||
@@ -3,7 +3,13 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { isFirefox } from 'common/Platform';
|
||||||
|
|
||||||
export const INVERTED_DEFAULT_COLOR = 257;
|
export const INVERTED_DEFAULT_COLOR = 257;
|
||||||
export const DIM_OPACITY = 0.5;
|
export const DIM_OPACITY = 0.5;
|
||||||
|
// The text baseline is set conditionally by browser. Using 'ideographic' for Firefox would
|
||||||
|
// result in truncated text (Issue 3353). Using 'bottom' for Chrome would result in slightly
|
||||||
|
// unaligned Powerline fonts (PR 3356#issuecomment-850928179).
|
||||||
|
export const TEXT_BASELINE: CanvasTextBaseline = isFirefox ? 'bottom' : 'ideographic';
|
||||||
|
|
||||||
export const CHAR_ATLAS_CELL_SPACING = 1;
|
export const CHAR_ATLAS_CELL_SPACING = 1;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, TEXT_BASELINE } from 'browser/renderer/atlas/Constants';
|
||||||
import { IGlyphIdentifier, ICharAtlasConfig } from 'browser/renderer/atlas/Types';
|
import { IGlyphIdentifier, ICharAtlasConfig } from 'browser/renderer/atlas/Types';
|
||||||
import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
|
import { BaseCharAtlas } from 'browser/renderer/atlas/BaseCharAtlas';
|
||||||
import { DEFAULT_ANSI_COLORS } from 'browser/ColorManager';
|
import { DEFAULT_ANSI_COLORS } from 'browser/ColorManager';
|
||||||
@@ -266,7 +266,7 @@ export class DynamicCharAtlas extends BaseCharAtlas {
|
|||||||
const fontStyle = glyph.italic ? 'italic' : '';
|
const fontStyle = glyph.italic ? 'italic' : '';
|
||||||
this._tmpCtx.font =
|
this._tmpCtx.font =
|
||||||
`${fontStyle} ${fontWeight} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`;
|
`${fontStyle} ${fontWeight} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`;
|
||||||
this._tmpCtx.textBaseline = 'ideographic';
|
this._tmpCtx.textBaseline = TEXT_BASELINE;
|
||||||
|
|
||||||
this._tmpCtx.fillStyle = this._getForegroundColor(glyph).css;
|
this._tmpCtx.fillStyle = this._getForegroundColor(glyph).css;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user