assign element in render call

This commit is contained in:
meganrogge
2022-03-09 08:46:09 -06:00
parent e797070121
commit 724bbebc14
2 changed files with 8 additions and 6 deletions
+6 -4
View File
@@ -134,12 +134,12 @@ export class DecorationService extends Disposable implements IDecorationService
export class ScrollbarDecoration extends Disposable implements IDecoration { export class ScrollbarDecoration extends Disposable implements IDecoration {
private readonly _marker: IMarker; private readonly _marker: IMarker;
private _canvas: HTMLCanvasElement | undefined; private _element: HTMLCanvasElement | undefined;
private _color: string | undefined; private _color: string | undefined;
public isDisposed: boolean = false; public isDisposed: boolean = false;
public get element(): HTMLCanvasElement { return this._canvas!; } public get element(): HTMLCanvasElement { return this._element!; }
public get marker(): IMarker { return this._marker; } public get marker(): IMarker { return this._marker; }
public get color(): string { return this._color!; } public get color(): string { return this._color!; }
@@ -151,18 +151,20 @@ export class ScrollbarDecoration extends Disposable implements IDecoration {
constructor( constructor(
options: IDecorationOptions, options: IDecorationOptions,
canvas: HTMLCanvasElement, private readonly _canvas: HTMLCanvasElement,
private readonly _ctx: CanvasRenderingContext2D, private readonly _ctx: CanvasRenderingContext2D,
@IBufferService private readonly _bufferService: IBufferService @IBufferService private readonly _bufferService: IBufferService
) { ) {
super(); super();
this._marker = options.marker; this._marker = options.marker;
this._canvas = canvas;
this._color = options.scrollbarDecorationColor; this._color = options.scrollbarDecorationColor;
this._marker.onDispose(() => this.dispose()); this._marker.onDispose(() => this.dispose());
this.render(); this.render();
} }
public render(): void { public render(): void {
if (!this._element) {
this._element = this._canvas;
}
this._ctx.lineWidth = 1; this._ctx.lineWidth = 1;
this._ctx.strokeStyle = this.color; this._ctx.strokeStyle = this.color;
this._ctx.strokeRect( this._ctx.strokeRect(
+2 -2
View File
@@ -427,8 +427,8 @@ declare module 'xterm' {
readonly onRender: IEvent<HTMLElement>; readonly onRender: IEvent<HTMLElement>;
/** /**
* The HTMLElement that gets created after the * The HTMLElement that gets created or drawn to (for scrollbar decorations)
* first _onRender call, or undefined if accessed before * after the first _onRender call, or undefined if accessed before
* that. * that.
*/ */
readonly element: HTMLElement | undefined; readonly element: HTMLElement | undefined;