From 30092f40a370863c15d0e6066e0af152d3e327f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xie=20jialong=20=E5=8A=AA=E5=8A=9B=E9=B8=AD?= <48614781+tisilent@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:34:34 +0800 Subject: [PATCH] update gutterOffsetX range (dirtydiff , fold) (#184339) * update gutterOffsetX range (dirtydiff , fold) * Update comment --------- Co-authored-by: Alex Ross --- src/vs/editor/contrib/folding/browser/folding.ts | 2 +- src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index baa610c8d31..d87acd50139 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -413,7 +413,7 @@ export class FoldingController extends Disposable 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 < 5) { // the whitespace between the border and the real folding icon border is 5px + if (gutterOffsetX < 4) { // the whitespace between the border and the real folding icon border is 4px return; } diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts index 9dfc51bd41d..9234b8da055 100644 --- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts @@ -922,7 +922,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu const gutterOffsetX = data.offsetX - offsetLeftInGutter; // TODO@joao TODO@alex TODO@martin this is such that we don't collide with folding - if (gutterOffsetX < -3 || gutterOffsetX > 6) { // dirty diff decoration on hover is 9px wide + if (gutterOffsetX < -3 || gutterOffsetX > 3) { // dirty diff decoration on hover is 6px wide return; }