From abbfa906f88a88794cdd8e94359e213168ff175d Mon Sep 17 00:00:00 2001 From: graann Date: Thu, 26 Apr 2018 18:51:42 +0300 Subject: [PATCH] incorrect font style in analyze data flow to\from tool window tabs (#IDEA-190646) (cherry picked from commit 803bf0c) https://upsource.jetbrains.com/IDEA/review/IDEA-CR-32397 --- .../usageView/UsageContextDataflowToPanel.java | 5 ----- .../src/com/intellij/slicer/SliceManager.java | 2 +- .../src/com/intellij/slicer/SlicePanel.java | 13 +------------ .../intellij/openapi/wm/impl/content/BaseLabel.java | 5 ++--- .../openapi/wm/impl/content/ContentTabLabel.java | 2 +- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/java/java-impl/src/com/intellij/usageView/UsageContextDataflowToPanel.java b/java/java-impl/src/com/intellij/usageView/UsageContextDataflowToPanel.java index 636d8aca299e..166329e71da6 100644 --- a/java/java-impl/src/com/intellij/usageView/UsageContextDataflowToPanel.java +++ b/java/java-impl/src/com/intellij/usageView/UsageContextDataflowToPanel.java @@ -134,11 +134,6 @@ public class UsageContextDataflowToPanel extends UsageContextPanelBase { return false; } - @Override - public boolean isToShowCloseButton() { - return false; - } - @Override public boolean isAutoScroll() { return false; diff --git a/platform/lang-impl/src/com/intellij/slicer/SliceManager.java b/platform/lang-impl/src/com/intellij/slicer/SliceManager.java index 02ae1f31dd73..330196975e8e 100644 --- a/platform/lang-impl/src/com/intellij/slicer/SliceManager.java +++ b/platform/lang-impl/src/com/intellij/slicer/SliceManager.java @@ -119,7 +119,7 @@ public class SliceManager implements PersistentStateComponent" + UIUtil.getCssFontDeclaration(BaseLabel.getLabelFont()) + "" + + return "" + (prefix == null ? "" : prefix) + StringUtil.first(desc, 100, true)+(suffix == null ? "" : suffix) + ""; } diff --git a/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java b/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java index a19da9addaef..a3d638ec256d 100644 --- a/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java +++ b/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java @@ -351,9 +351,7 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider, if (isToShowAutoScrollButton()) { actionGroup.add(myAutoScrollToSourceHandler.createToggleAction()); } - if (isToShowCloseButton()) { - actionGroup.add(new CloseAction()); - } + if (isToShowPreviewButton()) { actionGroup.add(new ToggleAction(UsageViewBundle.message("preview.usages.action.text", "usages"), "preview", AllIcons.Actions.PreviewDetails) { @Override @@ -382,20 +380,11 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider, public abstract void setAutoScroll(boolean autoScroll); - public boolean isToShowCloseButton() {return true;} - public boolean isToShowPreviewButton() {return true;} public abstract boolean isPreview(); public abstract void setPreview(boolean preview); - private class CloseAction extends CloseTabToolbarAction { - @Override - public final void actionPerformed(final AnActionEvent e) { - close(); - } - } - protected void close() { final ProgressIndicator progress = myBuilder.getUi().getProgress(); if (progress != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/BaseLabel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/BaseLabel.java index 3e66ad6d4afa..ea628e399c71 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/BaseLabel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/BaseLabel.java @@ -50,7 +50,7 @@ public class BaseLabel extends JLabel { @Override public Font getFont() { - Font font = JBUI.CurrentTheme.ToolWindow.headerFont(); + Font font = getLabelFont(); if (myBold) { font = font.deriveFont(Font.BOLD); } @@ -59,8 +59,7 @@ public class BaseLabel extends JLabel { } public static Font getLabelFont() { - Font f = UIUtil.getLabelFont(); - return f.deriveFont(f.getStyle(), Math.max(11, f.getSize() - 2)); + return JBUI.CurrentTheme.ToolWindow.headerFont(); } public void setActiveFg(final Color fg) { 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 b4471bb5dc4b..956121718470 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 @@ -138,7 +138,7 @@ class ContentTabLabel extends BaseLabel { } public ContentTabLabel(@NotNull Content content, @NotNull TabContentLayout layout) { - super(layout.myUi, true); + super(layout.myUi, false); myLayout = layout; myContent = content;