From e3402938adcfb555ba03a101e475db3b89df7900 Mon Sep 17 00:00:00 2001 From: graann Date: Mon, 7 May 2018 15:40:43 +0300 Subject: [PATCH] Too small distance between TW header Find, Messages and tab (#IDEA-190646) (cherry picked from commit ac49680) https://upsource.jetbrains.com/IDEA/review/IDEA-CR-32397 --- .../openapi/wm/impl/content/ContentLayout.java | 15 ++------------- .../openapi/wm/impl/content/ContentTabLabel.java | 11 +---------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentLayout.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentLayout.java index c20715458c47..a796a9ea8595 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentLayout.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentLayout.java @@ -57,23 +57,12 @@ abstract class ContentLayout { protected void updateIdLabel(BaseLabel label) { String title = myUi.myWindow.getStripeTitle(); - Border border = JBUI.Borders.empty(0, 2, 0, 8); - if (myUi.myManager.getContentCount() != 1) { + if (myUi.myManager.getContentCount() != 1 || myUi.myManager.canCloseContents()) { title += ":"; } - else { - final String text = myUi.myManager.getContent(0).getDisplayName(); - if (text != null && text.trim().length() > 0) { - if (myUi.myManager.canCloseContents()) { - title += ":"; - } - title += " "; - border = JBUI.Borders.emptyLeft(2); - } - } label.setText(title); - label.setBorder(border); + label.setBorder(JBUI.Borders.empty(0, 2, 0, 7)); label.setVisible(shouldShowId()); } 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 956121718470..5acaac1ee2b2 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 @@ -205,19 +205,10 @@ class ContentTabLabel extends BaseLabel { } public void update() { + setHorizontalAlignment(SwingConstants.LEFT); if (!myLayout.isToDrawTabs()) { - setHorizontalAlignment(SwingConstants.LEFT); setBorder(null); } - else { - if (additionalIcons.stream().anyMatch(icon -> icon.getAvailable())) { - setHorizontalAlignment(SwingConstants.LEFT); - } - else { - setHorizontalAlignment(SwingConstants.CENTER); - setBorder(JBUI.Borders.empty(0, 12)); - } - } updateTextAndIcon(myContent, isSelected()); }