From 66cb3dea7ecd4d1791c3dcd5a9ea06d7ce43db5a Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Mon, 24 Jun 2019 22:07:32 +0300 Subject: [PATCH] vcs: Use one-pixel splitter for diff preview in "Local Changes" and "Shelf" (IDEA-217029) GitOrigin-RevId: 79a1f527e9f05791b89832a2115ebd490afb4f79 --- .../openapi/vcs/changes/PreviewDiffSplitterComponent.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/PreviewDiffSplitterComponent.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/PreviewDiffSplitterComponent.java index 931ff10572b6..9cc903c1a0e3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/PreviewDiffSplitterComponent.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/PreviewDiffSplitterComponent.java @@ -3,7 +3,7 @@ package com.intellij.openapi.vcs.changes; import com.intellij.diff.impl.DiffRequestProcessor; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.JBSplitter; +import com.intellij.ui.OnePixelSplitter; import com.intellij.ui.SideBorder; import org.jetbrains.annotations.NotNull; @@ -12,7 +12,7 @@ import javax.swing.*; import static com.intellij.openapi.vcs.changes.actions.diff.lst.LocalChangeListDiffTool.ALLOW_EXCLUDE_FROM_COMMIT; import static com.intellij.util.ui.JBUI.emptySize; -public class PreviewDiffSplitterComponent extends JBSplitter { +public class PreviewDiffSplitterComponent extends OnePixelSplitter { @NotNull private final JComponent myFirstComponent; @NotNull private final DiffPreviewUpdateProcessor myProcessor; private boolean myDetailsOn; @@ -47,8 +47,7 @@ public class PreviewDiffSplitterComponent extends JBSplitter { private void updateVisibility() { setSecondComponent(myDetailsOn ? myProcessor.getComponent() : null); - myFirstComponent.setBorder(myDetailsOn ? IdeBorderFactory.createBorder(SideBorder.RIGHT|SideBorder.LEFT) : - IdeBorderFactory.createBorder(SideBorder.LEFT)); + myFirstComponent.setBorder(IdeBorderFactory.createBorder(SideBorder.LEFT)); JComponent secondComponent = getSecondComponent(); if (secondComponent != null) { secondComponent.setMinimumSize(emptySize());