development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #21089. Drag slightly out of the editor.

Browse source
This commit is contained in:
rebornix 2017-02-23 11:03:47 -08:00
parent de731d6b74
commit a75e535fb7
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/vs/editor/contrib/dnd/browser/dnd.ts
View file

@ -7,7 +7,7 @@
import 'vs/css!./dnd';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ICodeEditor, IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
import { ICodeEditor, IEditorMouseEvent, IMouseTarget } from 'vs/editor/browser/editorBrowser';
import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
import * as editorCommon from 'vs/editor/common/editorCommon';
import { Position } from 'vs/editor/common/core/position';
@ -56,9 +56,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
}
private _onEditorMouseDrop(mouseEvent: IEditorMouseEvent): void {
if (mouseEvent.target &&
(mouseEvent.target.type === editorCommon.MouseTargetType.CONTENT_TEXT || mouseEvent.target.type === editorCommon.MouseTargetType.CONTENT_EMPTY) &&
mouseEvent.target.position) {
if (mouseEvent.target && (this._hitContent(mouseEvent.target) || this._hitMargin(mouseEvent.target)) && mouseEvent.target.position) {
let newCursorPosition = new Position(mouseEvent.target.position.lineNumber, mouseEvent.target.position.column);
if (this._dragSelection.containsPosition(newCursorPosition)) {
@ -98,6 +96,17 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
});
}
private _hitContent(target: IMouseTarget): boolean {
return target.type === editorCommon.MouseTargetType.CONTENT_TEXT ||
target.type === editorCommon.MouseTargetType.CONTENT_EMPTY;
}
private _hitMargin(target: IMouseTarget): boolean {
return target.type === editorCommon.MouseTargetType.GUTTER_GLYPH_MARGIN ||
target.type === editorCommon.MouseTargetType.GUTTER_LINE_NUMBERS ||
target.type === editorCommon.MouseTargetType.GUTTER_LINE_DECORATIONS;
}
public getId(): string {
return DragAndDropController.ID;
}