Merge branch 'master' into parser_hooks
This commit is contained in:
+1
-1
@@ -665,9 +665,9 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this.linkifier.attachToDom(this.element, this._mouseZoneManager);
|
this.linkifier.attachToDom(this.element, this._mouseZoneManager);
|
||||||
|
|
||||||
// apply mouse event classes set by escape codes before terminal was attached
|
// apply mouse event classes set by escape codes before terminal was attached
|
||||||
this.element.classList.toggle('enable-mouse-events', this.mouseEvents);
|
|
||||||
if (this.mouseEvents) {
|
if (this.mouseEvents) {
|
||||||
this._selectionService.disable();
|
this._selectionService.disable();
|
||||||
|
this.element.classList.add('enable-mouse-events');
|
||||||
} else {
|
} else {
|
||||||
this._selectionService.enable();
|
this._selectionService.enable();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,7 +165,13 @@ export class DomRenderer extends Disposable implements IRenderer {
|
|||||||
`}`;
|
`}`;
|
||||||
// Blink animation
|
// Blink animation
|
||||||
styles +=
|
styles +=
|
||||||
`@keyframes blink {` +
|
`@keyframes blink_box_shadow {` +
|
||||||
|
` 50% {` +
|
||||||
|
` box-shadow: none;` +
|
||||||
|
` }` +
|
||||||
|
`}`;
|
||||||
|
styles +=
|
||||||
|
`@keyframes blink_block {` +
|
||||||
` 0% {` +
|
` 0% {` +
|
||||||
` background-color: ${this._colors.cursor.css};` +
|
` background-color: ${this._colors.cursor.css};` +
|
||||||
` color: ${this._colors.cursorAccent.css};` +
|
` color: ${this._colors.cursorAccent.css};` +
|
||||||
@@ -181,8 +187,11 @@ export class DomRenderer extends Disposable implements IRenderer {
|
|||||||
` outline: 1px solid ${this._colors.cursor.css};` +
|
` outline: 1px solid ${this._colors.cursor.css};` +
|
||||||
` outline-offset: -1px;` +
|
` outline-offset: -1px;` +
|
||||||
`}` +
|
`}` +
|
||||||
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_BLINK_CLASS} {` +
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_BLINK_CLASS}:not(.${CURSOR_STYLE_BLOCK_CLASS}) {` +
|
||||||
` animation: blink 1s step-end infinite;` +
|
` animation: blink_box_shadow 1s step-end infinite;` +
|
||||||
|
`}` +
|
||||||
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_BLINK_CLASS}.${CURSOR_STYLE_BLOCK_CLASS} {` +
|
||||||
|
` animation: blink_block 1s step-end infinite;` +
|
||||||
`}` +
|
`}` +
|
||||||
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_STYLE_BLOCK_CLASS} {` +
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_STYLE_BLOCK_CLASS} {` +
|
||||||
` background-color: ${this._colors.cursor.css};` +
|
` background-color: ${this._colors.cursor.css};` +
|
||||||
|
|||||||
Reference in New Issue
Block a user