From 4835b1b8976e2a8f37660de0d7ea1c3664091ce3 Mon Sep 17 00:00:00 2001 From: Surendrajat Date: Sun, 21 Feb 2021 17:31:10 +0530 Subject: [PATCH] fix(gui): compact TabComponent labels and TabToolTip (#1120) (PR #1121) * Compact CodePanel labels and TabToolTip * Remove top padding from tab title --- jadx-gui/src/main/java/jadx/gui/ui/ContentPanel.java | 7 ++++++- jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/ContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/ContentPanel.java index 07422a3ec..13357f122 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/ContentPanel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/ContentPanel.java @@ -4,6 +4,7 @@ import javax.swing.*; import org.jetbrains.annotations.Nullable; +import jadx.gui.treemodel.JClass; import jadx.gui.treemodel.JNode; public abstract class ContentPanel extends JPanel { @@ -38,6 +39,10 @@ public abstract class ContentPanel extends JPanel { */ @Nullable public String getTabTooltip() { - return null; + JClass jClass = node.getRootClass(); + if (jClass != null) { + return jClass.getFullName(); + } + return node.getName(); } } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java b/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java index 98968dd67..198696afd 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java @@ -47,7 +47,13 @@ public class TabComponent extends JPanel { panel.setOpaque(false); JNode node = contentPanel.getNode(); - label = new JLabel(node.makeLongStringHtml()); + String tabTitle; + if (node.getRootClass() != null) { + tabTitle = node.getRootClass().getName(); + } else { + tabTitle = node.makeLongStringHtml(); + } + label = new JLabel(tabTitle); label.setFont(getLabelFont()); String toolTip = contentPanel.getTabTooltip(); if (toolTip != null) { @@ -89,7 +95,7 @@ public class TabComponent extends JPanel { panel.add(label); panel.add(closeBtn); - panel.setBorder(BorderFactory.createEmptyBorder(4, 0, 0, 0)); + panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); } private JPopupMenu createTabPopupMenu(final ContentPanel contentPanel) {