From 1ce75cd4e9f92a3361438a93718d99c58747102a Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 8 Mar 2019 12:16:27 -0800
Subject: [PATCH] Encapsulate hacks inside WebglRenderer

---
 src/renderer/ColorManager.ts        |  9 ---------
 src/renderer/webgl/WebglRenderer.ts | 12 +++++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/renderer/ColorManager.ts b/src/renderer/ColorManager.ts
index ae23fd7a..3459e48f 100644
--- a/src/renderer/ColorManager.ts
+++ b/src/renderer/ColorManager.ts
@@ -140,15 +140,6 @@ export class ColorManager implements IColorManager {
     this.colors.ansi[15] = this._parseColor(theme.brightWhite, DEFAULT_ANSI_COLORS[15]);
   }
 
-  public applyWebglSelectionColorHack() {
-    // HACK: while webgl renderer adds support for selection colors
-    if (this.getLuminance(this.colors.background) > 0.5) {
-      this.colors.selection = this._parseColor('#000', DEFAULT_SELECTION, true);
-    } else {
-      this.colors.selection = this._parseColor('#fff', DEFAULT_SELECTION, true);
-    }
-  }
-
   private _parseColor(
     css: string,
     fallback: IColor,
diff --git a/src/renderer/webgl/WebglRenderer.ts b/src/renderer/webgl/WebglRenderer.ts
index ec9e140d..f4eeba37 100644
--- a/src/renderer/webgl/WebglRenderer.ts
+++ b/src/renderer/webgl/WebglRenderer.ts
@@ -52,7 +52,7 @@ export class WebglRenderer extends EventEmitter implements IRenderer {
     this.colorManager = new ColorManager(document, allowTransparency);
     if (theme) {
       this.colorManager.setTheme(theme);
-      this.colorManager.applyWebglSelectionColorHack();
+      this._applyBgLuminanceBasedSelection();
     }
 
     this._renderLayers = [
@@ -108,6 +108,15 @@ export class WebglRenderer extends EventEmitter implements IRenderer {
     super.dispose();
   }
 
+  private _applyBgLuminanceBasedSelection(): void {
+    // HACK: While webgl renderer adds support for selection colors
+    if (this.colorManager.getLuminance(this.colorManager.colors.background) > 0.5) {
+      this.colorManager.colors.selection = { css: '#000', rgba: 255 };
+    } else {
+      this.colorManager.colors.selection = { css: '#fff', rgba: 4294967295 };
+    }
+  }
+
   public onIntersectionChange(entry: IntersectionObserverEntry): void {
     this._isPaused = entry.intersectionRatio === 0;
     if (!this._isPaused && this._needsFullRefresh) {
@@ -128,6 +137,7 @@ export class WebglRenderer extends EventEmitter implements IRenderer {
   public setTheme(theme: ITheme | undefined): IColorSet {
     if (theme) {
       this.colorManager.setTheme(theme);
+      this._applyBgLuminanceBasedSelection();
     }
 
     // Clear layers and force a full render