waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

exclude combined from merge, fix linter

Browse Source
This commit is contained in:
Jörg Breitbart
2023-07-22 16:32:01 +02:00
parent c515cc2823
commit 6785dc19ab
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/renderer/dom/DomRendererRowFactory.ts
+4 -3
View File
@@ -125,6 +125,7 @@ export class DomRendererRowFactory {
const isInSelection = this._isCellInSelection(x, row);
const isCursorCell = isCursorRow && x === cursorX;
const cc = cell.getCode();
const isCombined = cell.isCombined();
if (!charElement) {
charElement = this._document.createElement('span');
@@ -139,8 +140,8 @@ export class DomRendererRowFactory {
*/
// FIMXE: add combined check, fix \xa0 text handling as below
if (
cellAmount && width === 1
&& cell.bg === oldBg && cell.fg === oldFg && cell.extended.ext == oldExt
cellAmount && width === 1 && !isCombined
&& cell.bg === oldBg && cell.fg === oldFg && cell.extended.ext === oldExt
&& cc < 1424 && !metrics[cc]
&& !isInSelection
&& !isCursorCell
@@ -370,7 +371,7 @@ export class DomRendererRowFactory {
// account first char for later merge if it meets the start conditions
if (width === 1 && cc < 1424 && !metrics[cc] && !isInSelection && !isCursorCell) {
if (width === 1 && !isCombined && cc < 1424 && !metrics[cc] && !isInSelection && !isCursorCell) {
cellAmount++;
} else {
// every non-mergeable char gets directly written to its own span