waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pull modifier code into helper, apply to lines scrolled

Browse Source
This commit is contained in:
Daniel Imms
2019-10-15 16:21:20 -07:00
parent 0083c23b2d
commit e76b8f86b5
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/Viewport.ts
+13 -24
View File
@@ -191,31 +191,9 @@ export class Viewport extends Disposable implements IViewport {
return 0;
}
const modifier = this._optionsService.options.fastScrollModifier;
const sensitivity = this._optionsService.options.fastScrollSensitivity;
// Multiply the scroll speed when the modifier is down
let multiplier = 1;
switch (modifier) {
case 'alt':
if (ev.altKey) {
multiplier = sensitivity;
}
break;
case 'ctrl':
if (ev.ctrlKey) {
multiplier = sensitivity;
}
break;
case 'shift':
if (ev.shiftKey) {
multiplier = sensitivity;
}
break;
}
// Fallback to WheelEvent.DOM_DELTA_PIXEL
let amount = ev.deltaY * multiplier;
let amount = this._applyFastScrollModifier(ev.deltaY, ev);
if (ev.deltaMode === WheelEvent.DOM_DELTA_LINE) {
amount *= this._currentRowHeight;
} else if (ev.deltaMode === WheelEvent.DOM_DELTA_PAGE) {
@@ -236,7 +214,7 @@ export class Viewport extends Disposable implements IViewport {
}
// Fallback to WheelEvent.DOM_DELTA_LINE
let amount = ev.deltaY;
let amount = this._applyFastScrollModifier(ev.deltaY, ev);
if (ev.deltaMode === WheelEvent.DOM_DELTA_PIXEL) {
amount /= this._currentRowHeight + 0.0; // Prevent integer division
this._wheelPartialScroll += amount;
@@ -248,6 +226,17 @@ export class Viewport extends Disposable implements IViewport {
return amount;
}
private _applyFastScrollModifier(amount: number, ev: WheelEvent): number {
const modifier = this._optionsService.options.fastScrollModifier;
// Multiply the scroll speed when the modifier is down
if ((modifier === 'alt' && ev.altKey) ||
(modifier === 'ctrl' && ev.ctrlKey) ||
(modifier === 'shift' && ev.shiftKey)) {
return amount * this._optionsService.options.fastScrollSensitivity;
}
return amount;
}
/**
* Handles the touchstart event, recording the touch occurred.
* @param ev The touch event.