From 73ee951807ea1b5ebfa7598ea30dac34b241667f Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:43:54 -0700 Subject: [PATCH] Resolve more todos --- src/browser/CoreBrowserTerminal.ts | 24 ------------------------ src/browser/Viewport.ts | 2 -- 2 files changed, 26 deletions(-) diff --git a/src/browser/CoreBrowserTerminal.ts b/src/browser/CoreBrowserTerminal.ts index 2858e688..ea648557 100644 --- a/src/browser/CoreBrowserTerminal.ts +++ b/src/browser/CoreBrowserTerminal.ts @@ -810,27 +810,7 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal { this.coreService.triggerDataEvent(sequence, true); return this.cancel(ev, true); } - - // normal viewport scrolling - // conditionally stop event, if the viewport still had rows to scroll within - // if (this.viewport!.handleWheel(ev)) { - // return this.cancel(ev); - // } }, { passive: false })); - - // TODO: Make sure this.coreMouseService.areMouseEventsActive still works - // this.register(addDisposableDomListener(el, 'touchstart', (ev: TouchEvent) => { - // if (this.coreMouseService.areMouseEventsActive) return; - // this.viewport!.handleTouchStart(ev); - // return this.cancel(ev); - // }, { passive: true })); - - // this.register(addDisposableDomListener(el, 'touchmove', (ev: TouchEvent) => { - // if (this.coreMouseService.areMouseEventsActive) return; - // if (!this.viewport!.handleTouchMove(ev)) { - // return this.cancel(ev); - // } - // }, { passive: false })); } @@ -1241,8 +1221,6 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal { // IMPORTANT: Fire scroll event before viewport is reset. This ensures embedders get the clear // scroll event and that the viewport's state will be valid for immediate writes. this._onScroll.fire({ position: this.buffer.ydisp }); - // TODO: Reset scrollable element? - // this.viewport?.reset(); this.refresh(0, this.rows - 1); } @@ -1267,8 +1245,6 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal { super.reset(); this._selectionService?.reset(); this._decorationService.reset(); - // TODO: Reset scrollable element? - // this.viewport?.reset(); // reattach this._customKeyEventHandler = customKeyEventHandler; diff --git a/src/browser/Viewport.ts b/src/browser/Viewport.ts index 0bf51f0f..01c6bd9a 100644 --- a/src/browser/Viewport.ts +++ b/src/browser/Viewport.ts @@ -40,8 +40,6 @@ export class Viewport extends Disposable { ) { super(); - // TODO: Support smooth scroll - const scrollable = this.register(new Scrollable({ forceIntegerValues: false, smoothScrollDuration: this._optionsService.rawOptions.smoothScrollDuration,