From cb28e2164fe6c367c24e92bfe200db0f444446ed Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 27 Aug 2018 14:58:02 +0300 Subject: [PATCH] IDEA-197937 ui: fix tab height in debugger toolwindow on HiDPI Linux * Do not add `getActiveTabUnderlineHeight` twice, as it is already done in super method --- .../execution/ui/layout/impl/JBRunnerTabs.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/JBRunnerTabs.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/JBRunnerTabs.java index 2576802954d8..51547ab6fa5f 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/JBRunnerTabs.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/JBRunnerTabs.java @@ -26,12 +26,12 @@ import com.intellij.ui.tabs.UiDecorator; import com.intellij.ui.tabs.impl.JBEditorTabs; import com.intellij.ui.tabs.impl.JBTabsImpl; import com.intellij.ui.tabs.impl.TabLabel; +import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import javax.swing.border.EmptyBorder; import java.awt.*; import java.util.Map; @@ -107,7 +107,7 @@ public class JBRunnerTabs extends JBEditorTabs { @Override public void apply(UiDecorator.UiDecoration decoration) { - setBorder(new EmptyBorder(5, 5, 7, 5));//Don't use JBUI here, it clips tab text in case of HiDPI + setBorder(JBUI.Borders.empty(5, 5, 7, 5)); } @Override @@ -125,12 +125,5 @@ public class JBRunnerTabs extends JBEditorTabs { wrapper.add(Box.createHorizontalStrut(6), BorderLayout.WEST); } } - - @Override - public Dimension getPreferredSize() { - Dimension result = super.getPreferredSize(); - result.height += myTabs.getActiveTabUnderlineHeight() - 1; - return result; - } } }