From fe7f28a7a0685f9ba83b5fe856bc241cb6207d32 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 18 Aug 2021 07:38:02 -0700
Subject: [PATCH] Fix block elements on webgl, scale block elements to cell

---
 .../xterm-addon-webgl/src/atlas/WebglCharAtlas.ts   |  2 +-
 src/browser/renderer/BaseRenderLayer.ts             |  4 ++--
 src/browser/renderer/BoxAndBlockCharacters.ts       | 13 +++----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts b/addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts
index 8fd43e1e..3b40659e 100644
--- a/addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts
+++ b/addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts
@@ -394,7 +394,7 @@ export class WebglCharAtlas implements IDisposable {
     // Draw custom characters if applicable
     let drawSuccess = false;
     if (this._config.customBlockAndBoxCharacters !== false) {
-      drawSuccess = tryDrawCustomChar(this._tmpCtx, chars, TMP_CANVAS_GLYPH_PADDING, TMP_CANVAS_GLYPH_PADDING, this._config.scaledCellWidth, this._config.scaledCellHeight, this._config.scaledCharWidth, this._config.scaledCharHeight);
+      drawSuccess = tryDrawCustomChar(this._tmpCtx, chars, TMP_CANVAS_GLYPH_PADDING, TMP_CANVAS_GLYPH_PADDING, this._config.scaledCellWidth, this._config.scaledCellHeight);
     }
 
     // Draw the character
diff --git a/src/browser/renderer/BaseRenderLayer.ts b/src/browser/renderer/BaseRenderLayer.ts
index afa12bb2..b994a8df 100644
--- a/src/browser/renderer/BaseRenderLayer.ts
+++ b/src/browser/renderer/BaseRenderLayer.ts
@@ -264,7 +264,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     // Draw custom characters if applicable
     let drawSuccess = false;
     if (this._optionsService.options.customBlockAndBoxCharacters !== false) {
-      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight, this._scaledCharLeft, this._scaledCharTop);
+      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
     }
 
     // Draw the character
@@ -388,7 +388,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     // Draw custom characters if applicable
     let drawSuccess = false;
     if (this._optionsService.options.customBlockAndBoxCharacters !== false) {
-      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight, this._scaledCharLeft, this._scaledCharTop);
+      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
     }
 
     // Draw the character
diff --git a/src/browser/renderer/BoxAndBlockCharacters.ts b/src/browser/renderer/BoxAndBlockCharacters.ts
index b38199ad..7d9a32bf 100644
--- a/src/browser/renderer/BoxAndBlockCharacters.ts
+++ b/src/browser/renderer/BoxAndBlockCharacters.ts
@@ -291,13 +291,11 @@ export function tryDrawCustomChar(
   xOffset: number,
   yOffset: number,
   scaledCellWidth: number,
-  scaledCellHeight: number,
-  scaledCharLeft: number,
-  scaledCharTop: number
+  scaledCellHeight: number
 ): boolean {
   const blockElementDefinition = blockElementDefinitions[c];
   if (blockElementDefinition) {
-    drawBlockElementChar(ctx, blockElementDefinition, xOffset, yOffset, scaledCellWidth, scaledCellHeight, scaledCharLeft, scaledCharTop);
+    drawBlockElementChar(ctx, blockElementDefinition, xOffset, yOffset, scaledCellWidth, scaledCellHeight);
     return true;
   }
 
@@ -316,13 +314,8 @@ function drawBlockElementChar(
   xOffset: number,
   yOffset: number,
   scaledCellWidth: number,
-  scaledCellHeight: number,
-  scaledCharLeft: number,
-  scaledCharTop: number
+  scaledCellHeight: number
 ): void {
-  // TODO: Scale to cell not char?
-  xOffset += scaledCharLeft;
-  yOffset += scaledCharTop;
   for (let i = 0; i < charDefinition.length; i++) {
     const box = charDefinition[i];
     const xEighth = scaledCellWidth / 8;