From 6dd6d0391f9d8bc86e68413f34516331050aeb11 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 2 Sep 2017 00:05:31 -0700
Subject: [PATCH] Add cell spacing to char atlas

---
 src/renderer/BaseRenderLayer.ts |  8 +++++---
 src/renderer/CharAtlas.ts       | 16 +++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index ecd064f3f..bd8e48966 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -1,6 +1,6 @@
 import { IRenderLayer, IColorSet } from './Interfaces';
 import { ITerminal, ITerminalOptions } from '../Interfaces';
-import { acquireCharAtlas } from './CharAtlas';
+import { acquireCharAtlas, CHAR_ATLAS_CELL_SPACING } from './CharAtlas';
 
 export const INVERTED_DEFAULT_COLOR = -1;
 
@@ -110,14 +110,16 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     }
     if (code < 256 && colorIndex > 0 && fg < 16) {
       // ImageBitmap's draw about twice as fast as from a canvas
+      const charAtlasCellWidth = this.scaledCharWidth + CHAR_ATLAS_CELL_SPACING;
+      const charAtlasCellHeight = this.scaledCharHeight + CHAR_ATLAS_CELL_SPACING;
       this._ctx.drawImage(this._charAtlas,
-          code * this.scaledCharWidth, colorIndex * this.scaledCharHeight, this.scaledCharWidth, this.scaledCharHeight,
+          code * charAtlasCellWidth, colorIndex * charAtlasCellHeight, this.scaledCharWidth, this.scaledCharHeight,
           x * this.scaledCharWidth, y * this.scaledCharHeight, this.scaledCharWidth, this.scaledCharHeight);
     } else {
       this._drawUncachedChar(terminal, char, fg, x, y);
     }
     // This draws the atlas (for debugging purposes)
-    // this._ctx.drawImage(BaseRenderLayer._charAtlas, 0, 0);
+    // this._ctx.drawImage(this._charAtlas, 0, 0);
   }
 
   private _drawUncachedChar(terminal: ITerminal, char: string, fg: number, x: number, y: number): void {
diff --git a/src/renderer/CharAtlas.ts b/src/renderer/CharAtlas.ts
index e71d8d5a5..a9fe8bd30 100644
--- a/src/renderer/CharAtlas.ts
+++ b/src/renderer/CharAtlas.ts
@@ -1,6 +1,8 @@
 import { ITerminal, ITheme } from '../Interfaces';
 import { IColorSet } from '../renderer/Interfaces';
 
+export const CHAR_ATLAS_CELL_SPACING = 1;
+
 interface ICharAtlasConfig {
   fontSize: number;
   fontFamily: string;
@@ -100,8 +102,10 @@ class CharAtlasGenerator {
   }
 
   public generate(scaledCharWidth: number, scaledCharHeight: number, fontSize: number, fontFamily: string, foreground: string, ansiColors: string[]): Promise<ImageBitmap> {
-    this._canvas.width = 255 * scaledCharWidth;
-    this._canvas.height = (/*default*/1 + /*0-15*/16) * scaledCharHeight;
+    const cellWidth = scaledCharWidth + CHAR_ATLAS_CELL_SPACING;
+    const cellHeight = scaledCharHeight + CHAR_ATLAS_CELL_SPACING;
+    this._canvas.width = 255 * cellWidth;
+    this._canvas.height = (/*default*/1 + /*0-15*/16) * cellHeight;
 
     this._ctx.save();
     this._ctx.fillStyle = foreground;
@@ -110,7 +114,7 @@ class CharAtlasGenerator {
 
     // Default color
     for (let i = 0; i < 256; i++) {
-      this._ctx.fillText(String.fromCharCode(i), i * scaledCharWidth, 0);
+      this._ctx.fillText(String.fromCharCode(i), i * cellWidth, 0);
     }
 
     // Colors 0-15
@@ -119,13 +123,11 @@ class CharAtlasGenerator {
       if (colorIndex === 8) {
         this._ctx.font = `bold ${this._ctx.font}`;
       }
-      const y = (colorIndex + 1) * scaledCharHeight;
-      // Clear rectangle as some fonts seem to draw over the bottom boundary
-      this._ctx.clearRect(0, y, this._canvas.width, scaledCharHeight);
+      const y = (colorIndex + 1) * cellHeight;
       // Draw ascii characters
       for (let i = 0; i < 256; i++) {
         this._ctx.fillStyle = ansiColors[colorIndex];
-        this._ctx.fillText(String.fromCharCode(i), i * scaledCharWidth, y);
+        this._ctx.fillText(String.fromCharCode(i), i * cellWidth, y);
       }
     }
     this._ctx.restore();