From cfc010dc82066132b9d57d1c0e54cd6a7f7bd957 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 21 Aug 2018 13:57:01 -0700 Subject: [PATCH] Fix #56818. Mouse position validation for folding, scm and comments. --- src/vs/editor/contrib/folding/folding.ts | 2 +- .../workbench/parts/scm/electron-browser/dirtydiffDecorator.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts index 520ad0ac57d..ab87bfe286b 100644 --- a/src/vs/editor/contrib/folding/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -339,7 +339,7 @@ export class FoldingController implements IEditorContribution { // const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft; // TODO@joao TODO@alex TODO@martin this is such that we don't collide with dirty diff - if (gutterOffsetX < 10) { + if (gutterOffsetX < 5) { // the whitespace between the border and the real folding icon border is 5px return; } diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index def130b2dd7..48417f8b9d3 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -712,7 +712,7 @@ export class DirtyDiffController implements IEditorContribution { const gutterOffsetX = data.offsetX - offsetLeftInGutter; // TODO@joao TODO@alex TODO@martin this is such that we don't collide with folding - if (gutterOffsetX < 0 || gutterOffsetX > 10) { + if (gutterOffsetX < -3 || gutterOffsetX > 6) { // dirty diff decoration on hover is 9px wide return; } -- GitLab