Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-26 19:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #194644 from microsoft/tyriar/192816

Browse Source 
Fix term exception during font measurement
This commit is contained in:
Daniel Imms
2023-10-03 11:39:25 -07:00
committed by GitHub
parent 097840b4e8 bbe37fe987
commit b7a3bfcb4c
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
+5 -4
View File
@@ -191,15 +191,16 @@ export class TerminalConfigHelper extends Disposable implements IBrowserTerminal
}
// Get the character dimensions from xterm if it's available
if (xtermCore) {
if (xtermCore._renderService && xtermCore._renderService.dimensions?.css.cell.width && xtermCore._renderService.dimensions?.css.cell.height) {
if (xtermCore?._renderService?._renderer.value) {
const cellDims = xtermCore._renderService.dimensions.css.cell;
if (cellDims?.width && cellDims?.height) {
return {
fontFamily,
fontSize,
letterSpacing,
lineHeight,
charHeight: xtermCore._renderService.dimensions.css.cell.height / lineHeight,
charWidth: xtermCore._renderService.dimensions.css.cell.width - Math.round(letterSpacing) / window.devicePixelRatio
charHeight: cellDims.height / lineHeight,
charWidth: cellDims.width - Math.round(letterSpacing) / window.devicePixelRatio
};
}
}
src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts
Vendored
+3 -1
View File
@@ -39,7 +39,9 @@ export interface IXtermCore {
}
},
_renderer: {
_renderLayers?: any[];
value?: {
_renderLayers?: any[];
}
};
_handleIntersectionChange: any;
};
src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+2 -2
View File
@@ -839,10 +839,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
private async _measureRenderTime(): Promise<void> {
const frameTimes: number[] = [];
if (!this._core._renderService?._renderer._renderLayers) {
if (!this._core._renderService?._renderer.value?._renderLayers) {
return;
}
const textRenderLayer = this._core._renderService._renderer._renderLayers[0];
const textRenderLayer = this._core._renderService._renderer.value._renderLayers[0];
const originalOnGridChanged = textRenderLayer?.onGridChanged;
const evaluateCanvasRenderer = () => {
// Discard first frame time as it's normal to take longer