From 86706d60b4cd59689880a001fccacf16de11cfef Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Mon, 20 Mar 2017 16:40:11 +0300
Subject: [PATCH] diff: make splitter thinner

* do not paint icon on it
---
 .../diff/tools/util/DiffSplitter.java         | 28 +++++++++++++------
 .../diff/tools/util/ThreeDiffSplitter.java    |  3 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
index f174b6c7685e..f19efb627d9c 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
@@ -16,7 +16,6 @@
 package com.intellij.diff.tools.util;
 
 import com.intellij.diff.util.DiffUtil;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionToolbar;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -36,12 +35,14 @@ import java.util.List;
 
 
 public class DiffSplitter extends Splitter {
+  public static final int DIVIDER_WIDTH = JBUI.scale(20);
+
   @Nullable private Painter myPainter;
   @Nullable private AnAction myTopAction;
   @Nullable private AnAction myBottomAction;
 
   public DiffSplitter() {
-    setDividerWidth(JBUI.scale(30));
+    setDividerWidth(DIVIDER_WIDTH);
   }
 
   @Override
@@ -58,17 +59,27 @@ public class DiffSplitter extends Splitter {
 
 
         GridBag bag = new GridBag();
+        JComponent button1 = syncComponents.get(0);
+        JComponent button2 = syncComponents.get(1);
 
-        if (syncComponents.get(0) != null) {
-          add(syncComponents.get(0), bag.nextLine());
-          add(Box.createVerticalStrut(JBUI.scale(20)), bag.nextLine());
+        if (button1 != null) {
+          int width = button1.getPreferredSize().width;
+          if (getDividerWidth() < width) setDividerWidth(width);
+        }
+        if (button2 != null) {
+          int width = button2.getPreferredSize().width;
+          if (getDividerWidth() < width) setDividerWidth(width);
         }
 
-        add(new JLabel(AllIcons.General.SplitGlueH), bag.nextLine());
 
-        if (syncComponents.get(1) != null) {
+        if (button1 != null) {
+          add(button1, bag.nextLine());
+        }
+        if (button1 != null && button2 != null) {
           add(Box.createVerticalStrut(JBUI.scale(20)), bag.nextLine());
-          add(syncComponents.get(1), bag.nextLine());
+        }
+        if (button2 != null) {
+          add(button2, bag.nextLine());
         }
 
 
@@ -112,6 +123,7 @@ public class DiffSplitter extends Splitter {
     if (action == null) return null;
 
     ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("DiffSplitter", new DefaultActionGroup(action), true);
+    toolbar.updateActionsImmediately();
     toolbar.setReservePlaceAutoPopupIcon(false);
     toolbar.getComponent().setCursor(Cursor.getDefaultCursor());
     return toolbar.getComponent();
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java b/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java
index 83d75c848447..34dc80d36211 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java
@@ -18,7 +18,6 @@ package com.intellij.diff.tools.util;
 import com.intellij.diff.tools.util.DiffSplitter.Painter;
 import com.intellij.diff.util.Side;
 import com.intellij.icons.AllIcons;
-import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.CalledInAwt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -151,7 +150,7 @@ public class ThreeDiffSplitter extends JPanel {
   }
 
   private static int getDividerWidth() {
-    return JBUI.scale(30);
+    return DiffSplitter.DIVIDER_WIDTH;
   }
 
   private class Divider extends JPanel {