From 6a5ba163c835949a8d2a6774812a00e25280b849 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 25 Sep 2014 19:41:29 +0400 Subject: [PATCH] IDEA-89153 diff: fix offset --- .../com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java | 2 +- .../intellij/openapi/diff/impl/incrementalMerge/ChangeType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java index ca0c129da027..e73060052fb9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java @@ -172,7 +172,7 @@ public abstract class DiffMarkup implements EditorSource, Disposable { marker.setLineSeparatorRenderer(new LineSeparatorRenderer() { @Override public void drawLine(Graphics g, int x1, int x2, int y) { - x2 = g.getClipBounds().width - x1; + x2 = g.getClipBounds().width; if (type.isInlineWrapper()) { UIUtil.drawLine((Graphics2D)g, x1, y, x2, y, null, DiffUtil.getFramingColor(color)); } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java index 4425112730d3..94f4caf17ab7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java @@ -136,7 +136,7 @@ public class ChangeType { Graphics2D g2 = (Graphics2D)g; Color color = myDiffType.getPolygonColor(markup.getEditor()); if (color != null) { - x2 = g.getClipBounds().width - x1; + x2 = g.getClipBounds().width; if (type.isApplied()) { UIUtil.drawBoldDottedLine(g2, x1, x2, y, null, color, false); }