From 3a4029f8ee4a3f7c8f2e7cedeb314742ccbddffd Mon Sep 17 00:00:00 2001
From: graann <Anna.Gromova@jetbrains.com>
Date: Mon, 18 Jun 2018 13:53:04 +0300
Subject: [PATCH] Incorrect close button position (#IDEA-192960)

---
 .../wm/impl/content/ContentTabLabel.java      | 37 +------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
index 27e05a292994..7cb99286d2b5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
@@ -269,7 +269,7 @@ class ContentTabLabel extends BaseLabel {
     }
 
     if (map.get(true) != null) {
-      right = ICONS_GAP + 4;
+      right = ICONS_GAP + JBUI.scale(4);
 
       for (AdditionalIcon icon : map.get(true)) {
         icon.setX(iconWidth + size.width + ICONS_GAP - right);
@@ -283,41 +283,6 @@ class ContentTabLabel extends BaseLabel {
     return new Dimension(iconWidth + size.width, size.height);
   }
 
-  private int updateAndGetInsetsWidth() {
-    if(myAdditionalIcons == null) return 0;
-
-    Map<Boolean, List<AdditionalIcon>> map =
-      myAdditionalIcons.stream().filter(icon -> icon.getAvailable()).collect(Collectors.groupingBy(icon -> icon.getAfterText()));
-
-    int right = DEFAULT_HORIZONTAL_INSET;
-    int left = DEFAULT_HORIZONTAL_INSET;
-
-    int iconWidth = 0;
-
-    if (map.get(false) != null) {
-      iconWidth = ICONS_GAP;
-
-      for (AdditionalIcon icon : map.get(false)) {
-        iconWidth += icon.getIconWidth() + ICONS_GAP;
-      }
-
-      left = iconWidth;
-      iconWidth = 0;
-    }
-
-    if (map.get(true) != null) {
-      right = ICONS_GAP + JBUI.scale(4);
-
-      for (AdditionalIcon icon : map.get(true)) {
-        iconWidth += icon.getIconWidth() + ICONS_GAP;
-      }
-    }
-
-    setBorder(JBUI.Borders.empty(0, left, 0, right));
-
-    return iconWidth + right + left;
-  }
-
   @Override
   protected boolean allowEngravement() {
     return isSelected() || (myUi != null && myUi.myWindow.isActive());