eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix dragging when in column selection mode

Browse Source
This commit is contained in:
Daniel Imms
2018-08-06 11:13:56 -07:00
parent 9165581266
commit 7675be7da3
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SelectionManager.ts
+19 -7
View File
@@ -576,11 +576,14 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
this._dragScrollAmount = this._getMouseEventScrollAmount(event); this._dragScrollAmount = this._getMouseEventScrollAmount(event);
// If the cursor was above or below the viewport, make sure it's at the // If the cursor was above or below the viewport, make sure it's at the
// start or end of the viewport respectively. // start or end of the viewport respectively. This should only happen when
if (this._dragScrollAmount > 0) { // NOT in column select mode.
this._model.selectionEnd[0] = this._terminal.cols; if (this._activeSelectionMode !== SelectionMode.COLUMN) {
} else if (this._dragScrollAmount < 0) { if (this._dragScrollAmount > 0) {
this._model.selectionEnd[0] = 0; this._model.selectionEnd[0] = this._terminal.cols;
} else if (this._dragScrollAmount < 0) {
this._model.selectionEnd[0] = 0;
}
} }
// If the character is a wide character include the cell to the right in the // If the character is a wide character include the cell to the right in the
@@ -609,10 +612,19 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
if (this._dragScrollAmount) { if (this._dragScrollAmount) {
this._terminal.scrollLines(this._dragScrollAmount, false); this._terminal.scrollLines(this._dragScrollAmount, false);
// Re-evaluate selection // Re-evaluate selection
// If the cursor was above or below the viewport, make sure it's at the
// start or end of the viewport respectively. This should only happen when
// NOT in column select mode.
if (this._dragScrollAmount > 0) { if (this._dragScrollAmount > 0) {
this._model.selectionEnd = [this._terminal.cols - 1, Math.min(this._terminal.buffer.ydisp + this._terminal.rows, this._terminal.buffer.lines.length - 1)]; if (this._activeSelectionMode !== SelectionMode.COLUMN) {
this._model.selectionEnd[0] = this._terminal.cols - 1;
}
this._model.selectionEnd[1] = Math.min(this._terminal.buffer.ydisp + this._terminal.rows, this._terminal.buffer.lines.length - 1);
} else { } else {
this._model.selectionEnd = [0, this._terminal.buffer.ydisp]; if (this._activeSelectionMode !== SelectionMode.COLUMN) {
this._model.selectionEnd[0] = 0;
}
this._model.selectionEnd[1] = this._terminal.buffer.ydisp;
} }
this.refresh(); this.refresh();
} }