From 497d31bec3108e191709629dacf202b9b4796c06 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sat, 18 May 2019 19:31:35 -0700 Subject: [PATCH] onThemeChange -> setColors --- src/Terminal.ts | 2 +- src/TestUtils.test.ts | 2 +- src/renderer/BaseRenderLayer.ts | 2 +- src/renderer/Renderer.ts | 6 ++++-- src/renderer/Types.ts | 4 ++-- src/renderer/dom/DomRenderer.ts | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Terminal.ts b/src/Terminal.ts index e06938d95..652e04cad 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -851,7 +851,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II this._theme = theme; this._colorManager.setTheme(theme); if (this.renderer) { - this.renderer.onThemeChange(this._colorManager.colors); + this.renderer.setColors(this._colorManager.colors); } if (this.viewport) { this.viewport.onThemeChange(this._colorManager.colors); diff --git a/src/TestUtils.test.ts b/src/TestUtils.test.ts index 842f30d0e..f83e7d224 100644 --- a/src/TestUtils.test.ts +++ b/src/TestUtils.test.ts @@ -384,7 +384,7 @@ export class MockRenderer implements IRenderer { throw new Error('Method not implemented.'); } dimensions: IRenderDimensions; - onThemeChange(colors: IColorSet): void { + setColors(colors: IColorSet): void { throw new Error('Method not implemented.'); } onResize(cols: number, rows: number): void {} diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts index 3901a8603..bae96d723 100644 --- a/src/renderer/BaseRenderLayer.ts +++ b/src/renderer/BaseRenderLayer.ts @@ -74,7 +74,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { public onGridChanged(terminal: ITerminal, startRow: number, endRow: number): void {} public onSelectionChanged(terminal: ITerminal, start: [number, number], end: [number, number], columnSelectMode: boolean = false): void {} - public onThemeChange(terminal: ITerminal, colorSet: IColorSet): void { + public setColors(terminal: ITerminal, colorSet: IColorSet): void { this._refreshCharAtlas(terminal, colorSet); } diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts index b941d3143..50b41c46f 100644 --- a/src/renderer/Renderer.ts +++ b/src/renderer/Renderer.ts @@ -85,10 +85,12 @@ export class Renderer extends Disposable implements IRenderer { } } - public onThemeChange(colors: IColorSet): void { + public setColors(colors: IColorSet): void { + this._colors = colors; + // Clear layers and force a full render this._renderLayers.forEach(l => { - l.onThemeChange(this._terminal, this._colors); + l.setColors(this._terminal, this._colors); l.reset(this._terminal); }); diff --git a/src/renderer/Types.ts b/src/renderer/Types.ts index a72546fb9..c4028d6cf 100644 --- a/src/renderer/Types.ts +++ b/src/renderer/Types.ts @@ -28,7 +28,7 @@ export interface IRenderer extends IDisposable { dimensions: IRenderDimensions; dispose(): void; - onThemeChange(colors: IColorSet): void; + setColors(colors: IColorSet): void; onDevicePixelRatioChange(): void; onResize(cols: number, rows: number): void; onCharSizeChanged(): void; @@ -82,7 +82,7 @@ export interface IRenderLayer extends IDisposable { /** * Called when the theme changes. */ - onThemeChange(terminal: ITerminal, colorSet: IColorSet): void; + setColors(terminal: ITerminal, colorSet: IColorSet): void; /** * Called when the data in the grid has changed (or needs to be rendered diff --git a/src/renderer/dom/DomRenderer.ts b/src/renderer/dom/DomRenderer.ts index 1f3b11b85..2797639d3 100644 --- a/src/renderer/dom/DomRenderer.ts +++ b/src/renderer/dom/DomRenderer.ts @@ -131,7 +131,7 @@ export class DomRenderer extends Disposable implements IRenderer { this._terminal.screenElement.style.height = `${this.dimensions.canvasHeight}px`; } - public onThemeChange(colors: IColorSet): void { + public setColors(colors: IColorSet): void { this._colors = colors; this._injectCss(); }