Skip to content

Commit

Permalink
Revert "Merge pull request xtermjs#4611 from SimonSiefke/constructed-…
Browse files Browse the repository at this point in the history
…stylesheets"

This reverts commit 5889344, reversing
changes made to 679c149.
  • Loading branch information
Tyriar committed Aug 15, 2023
1 parent 2aee19f commit 4ed690b
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/browser/renderer/dom/DomRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { color } from 'common/Color';
import { EventEmitter } from 'common/EventEmitter';
import { Disposable, toDisposable } from 'common/Lifecycle';
import { IBufferService, IInstantiationService, IOptionsService } from 'common/services/Services';
import { createStyle, IStyleSheet } from './StyleSheet';


const TERMINAL_CLASS_PREFIX = 'xterm-dom-renderer-owner-';
Expand All @@ -36,8 +35,8 @@ export class DomRenderer extends Disposable implements IRenderer {
private _rowFactory: DomRendererRowFactory;
private _terminalClass: number = nextTerminalId++;

private _themeStyle!: IStyleSheet;
private _dimensionsStyle!: IStyleSheet;
private _themeStyleElement!: HTMLStyleElement;
private _dimensionsStyleElement!: HTMLStyleElement;
private _rowContainer: HTMLElement;
private _rowElements: HTMLElement[] = [];
private _selectionContainer: HTMLElement;
Expand Down Expand Up @@ -92,9 +91,9 @@ export class DomRenderer extends Disposable implements IRenderer {
// https://github.com/xtermjs/xterm.js/issues/2960
this._rowContainer.remove();
this._selectionContainer.remove();
this._themeStyle.dispose();
this._dimensionsStyle.dispose();
this._widthCache.dispose();
this._themeStyleElement.remove();
this._dimensionsStyleElement.remove();
}));

this._widthCache = new WidthCache(document);
Expand Down Expand Up @@ -130,8 +129,9 @@ export class DomRenderer extends Disposable implements IRenderer {
element.style.overflow = 'hidden';
}

if (!this._dimensionsStyle) {
this._dimensionsStyle = createStyle(this._screenElement);
if (!this._dimensionsStyleElement) {
this._dimensionsStyleElement = document.createElement('style');
this._screenElement.appendChild(this._dimensionsStyleElement);
}

const styles =
Expand All @@ -141,16 +141,17 @@ export class DomRenderer extends Disposable implements IRenderer {
` vertical-align: top;` +
`}`;

this._dimensionsStyle.setCss(styles);
this._dimensionsStyleElement.textContent = styles;

this._selectionContainer.style.height = this._viewportElement.style.height;
this._screenElement.style.width = `${this.dimensions.css.canvas.width}px`;
this._screenElement.style.height = `${this.dimensions.css.canvas.height}px`;
}

private _injectCss(colors: ReadonlyColorSet): void {
if (!this._themeStyle) {
this._themeStyle = createStyle(this._screenElement);
if (!this._themeStyleElement) {
this._themeStyleElement = document.createElement('style');
this._screenElement.appendChild(this._themeStyleElement);
}

// Base CSS
Expand Down Expand Up @@ -248,7 +249,7 @@ export class DomRenderer extends Disposable implements IRenderer {
`${this._terminalSelector} .${FG_CLASS_PREFIX}${INVERTED_DEFAULT_COLOR}.${RowCss.DIM_CLASS} { color: ${color.multiplyOpacity(color.opaque(colors.background), 0.5).css}; }` +
`${this._terminalSelector} .${BG_CLASS_PREFIX}${INVERTED_DEFAULT_COLOR} { background-color: ${colors.foreground.css}; }`;

this._themeStyle.setCss(styles);
this._themeStyleElement.textContent = styles;
}

/**
Expand Down

0 comments on commit 4ed690b

Please sign in to comment.