feat(gui): tabs drag and drop reorder support (#1212) (PR #2109)

skylot · Feb 25, 2024 · d7ec357 · d7ec357
1 parent d51362e
commit d7ec357
Show file tree

Hide file tree

Showing 32 changed files with 835 additions and 28 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/events/services/RenameService.java b/jadx-gui/src/main/java/jadx/gui/events/services/RenameService.java
@@ -27,10 +27,10 @@
 import jadx.gui.treemodel.JNode;
 import jadx.gui.treemodel.JRenameNode;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.ClassCodeContentPanel;
 import jadx.gui.ui.codearea.CodeArea;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.CacheObject;
 import jadx.gui.utils.JNodeCache;
 import jadx.gui.utils.NLS;

diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/mappings/JInputMapping.java b/jadx-gui/src/main/java/jadx/gui/plugins/mappings/JInputMapping.java
@@ -18,9 +18,9 @@
 import jadx.gui.treemodel.JClass;
 import jadx.gui.treemodel.JEditableNode;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.CodeContentPanel;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;
 import jadx.gui.utils.ui.SimpleMenuItem;

diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/mappings/RenameMappingsGui.java b/jadx-gui/src/main/java/jadx/gui/plugins/mappings/RenameMappingsGui.java
@@ -30,10 +30,10 @@
 import jadx.gui.treemodel.JNode;
 import jadx.gui.treemodel.JRoot;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.filedialog.FileDialogWrapper;
 import jadx.gui.ui.filedialog.FileOpenMode;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;
 import jadx.gui.utils.ui.ActionHandler;

diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java b/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java
@@ -19,9 +19,9 @@
 import jadx.api.impl.SimpleCodeInfo;
 import jadx.gui.treemodel.JClass;
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
 import jadx.gui.ui.panel.HtmlPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.UiUtils;
 
 public class QuarkReportNode extends JNode {

diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java b/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java
@@ -41,8 +41,8 @@
 import jadx.gui.JadxWrapper;
 import jadx.gui.treemodel.JMethod;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.JNodeCache;
 import jadx.gui.utils.ui.NodeLabel;
 

diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/script/ScriptContentPanel.java b/jadx-gui/src/main/java/jadx/gui/plugins/script/ScriptContentPanel.java
@@ -28,12 +28,12 @@
 import jadx.gui.settings.LineNumbersMode;
 import jadx.gui.treemodel.JInputScript;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.action.ActionModel;
 import jadx.gui.ui.action.JadxGuiAction;
 import jadx.gui.ui.codearea.AbstractCodeArea;
 import jadx.gui.ui.codearea.AbstractCodeContentPanel;
 import jadx.gui.ui.codearea.SearchBar;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.Icons;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java b/jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java
@@ -21,9 +21,9 @@
 import jadx.api.ResourceType;
 import jadx.api.impl.SimpleCodeInfo;
 import jadx.gui.JadxWrapper;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
 import jadx.gui.ui.panel.HtmlPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.CertificateManager;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java
@@ -23,10 +23,10 @@
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.nodes.ICodeNode;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.ClassCodeContentPanel;
 import jadx.gui.ui.dialog.RenameDialog;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.CacheObject;
 import jadx.gui.utils.Icons;
 import jadx.gui.utils.NLS;

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JInputScript.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JInputScript.java
@@ -17,8 +17,8 @@
 import jadx.core.utils.files.FileUtils;
 import jadx.gui.plugins.script.ScriptContentPanel;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;
 import jadx.gui.utils.ui.SimpleMenuItem;

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
@@ -16,8 +16,8 @@
 import jadx.api.JavaNode;
 import jadx.api.metadata.ICodeNodeRef;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 
 public abstract class JNode extends DefaultMutableTreeNode implements Comparable<JNode> {
 

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java
@@ -20,11 +20,11 @@
 import jadx.core.utils.ListUtils;
 import jadx.core.utils.Utils;
 import jadx.core.xmlgen.ResContainer;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.BinaryContentPanel;
 import jadx.gui.ui.codearea.CodeContentPanel;
 import jadx.gui.ui.panel.ContentPanel;
 import jadx.gui.ui.panel.ImagePanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.Icons;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
@@ -140,6 +140,8 @@
 import jadx.gui.ui.panel.JDebuggerPanel;
 import jadx.gui.ui.panel.ProgressPanel;
 import jadx.gui.ui.popupmenu.RecentProjectsMenuListener;
+import jadx.gui.ui.tab.TabbedPane;
+import jadx.gui.ui.tab.dnd.TabDndController;
 import jadx.gui.ui.treenodes.StartPageNode;
 import jadx.gui.ui.treenodes.SummaryNode;
 import jadx.gui.update.JadxUpdate;
@@ -1304,6 +1306,7 @@ public void treeWillCollapse(TreeExpansionEvent event) {
 
 		tabbedPane = new TabbedPane(this);
 		tabbedPane.setMinimumSize(new Dimension(150, 150));
+		new TabDndController(tabbedPane);
 
 		rightSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
 		rightSplitPane.setTopComponent(tabbedPane);

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java
@@ -1,8 +1,8 @@
 package jadx.gui.ui.codearea;
 
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.TabbedPane;
 
 /**
  * The abstract base class for a content panel that show text based code or a.g. a resource

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/BinaryContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/BinaryContentPanel.java
@@ -10,7 +10,7 @@
 import jadx.gui.settings.JadxSettings;
 import jadx.gui.settings.LineNumbersMode;
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
+import jadx.gui.ui.tab.TabbedPane;
 
 public class BinaryContentPanel extends AbstractCodeContentPanel {
 	private final transient CodePanel textCodePanel;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java
@@ -17,9 +17,9 @@
 import jadx.api.DecompilationMode;
 import jadx.gui.jobs.BackgroundExecutor;
 import jadx.gui.treemodel.JClass;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.mode.JCodeMode;
 import jadx.gui.ui.panel.IViewStateSupport;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.NLS;
 
 import static com.formdev.flatlaf.FlatClientProperties.TABBED_PANE_TRAILING_COMPONENT;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java
@@ -7,8 +7,8 @@
 import org.slf4j.LoggerFactory;
 
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.panel.IViewStateSupport;
+import jadx.gui.ui.tab.TabbedPane;
 
 public final class CodeContentPanel extends AbstractCodeContentPanel implements IViewStateSupport {
 	private static final long serialVersionUID = 5310536092010045565L;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java
@@ -50,9 +50,9 @@
 import jadx.gui.treemodel.JNode;
 import jadx.gui.treemodel.JResSearchNode;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.AbstractCodeArea;
 import jadx.gui.ui.panel.ProgressPanel;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.CacheObject;
 import jadx.gui.utils.JNodeCache;
 import jadx.gui.utils.JumpPosition;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java
@@ -7,7 +7,7 @@
 import jadx.gui.settings.JadxSettings;
 import jadx.gui.treemodel.JClass;
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
+import jadx.gui.ui.tab.TabbedPane;
 
 public abstract class ContentPanel extends JPanel {
 

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java
@@ -10,7 +10,7 @@
 
 import jadx.gui.settings.JadxSettings;
 import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.TabbedPane;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.utils.ui.ZoomActions;
 
 public final class HtmlPanel extends ContentPanel {

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java
@@ -17,8 +17,8 @@
 import jadx.core.utils.exceptions.JadxRuntimeException;
 import jadx.core.xmlgen.ResContainer;
 import jadx.gui.treemodel.JResource;
-import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.AbstractCodeArea;
+import jadx.gui.ui.tab.TabbedPane;
 
 public class ImagePanel extends ContentPanel {
 	private static final long serialVersionUID = 4071356367073142688L;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java
@@ -18,7 +18,7 @@
 
 import jadx.gui.settings.JadxSettings;
 import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.TabbedPane;
+import jadx.gui.ui.tab.TabbedPane;
 import jadx.gui.ui.treenodes.StartPageNode;
 import jadx.gui.utils.Icons;
 import jadx.gui.utils.NLS;

diff --git a/...c/main/java/jadx/gui/ui/TabComponent.java → ...in/java/jadx/gui/ui/tab/TabComponent.java b/...c/main/java/jadx/gui/ui/TabComponent.java → ...in/java/jadx/gui/ui/tab/TabComponent.java
@@ -1,7 +1,12 @@
-package jadx.gui.ui;
+package jadx.gui.ui.tab;
 
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.Point;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.List;
@@ -20,6 +25,7 @@
 import jadx.gui.treemodel.JEditableNode;
 import jadx.gui.treemodel.JNode;
 import jadx.gui.ui.panel.ContentPanel;
+import jadx.gui.ui.tab.dnd.TabDndGestureListener;
 import jadx.gui.utils.Icons;
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;
@@ -42,6 +48,9 @@ public TabComponent(TabbedPane tabbedPane, ContentPanel contentPanel) {
 
 	public void loadSettings() {
 		label.setFont(getLabelFont());
+		if (tabbedPane.getDnd() != null) {
+			tabbedPane.getDnd().loadSettings();
+		}
 	}
 
 	private Font getLabelFont() {
@@ -57,7 +66,7 @@ private void init() {
 		label.setFont(getLabelFont());
 		String toolTip = contentPanel.getTabTooltip();
 		if (toolTip != null) {
-			label.setToolTipText(toolTip);
+			setToolTipText(toolTip);
 		}
 		label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
 		label.setIcon(node.getIcon());
@@ -93,14 +102,28 @@ public void mousePressed(MouseEvent e) {
 			}
 		};
 		addMouseListener(clickAdapter);
-		label.addMouseListener(clickAdapter);
-		closeBtn.addMouseListener(clickAdapter);
+		addListenerForDnd();
 
 		add(label);
 		add(closeBtn);
 		setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 	}
 
+	private void addListenerForDnd() {
+		if (tabbedPane.getDnd() == null) {
+			return;
+		}
+		TabComponent comp = this;
+		DragGestureListener dgl = new TabDndGestureListener(tabbedPane.getDnd()) {
+			@Override
+			protected Point getDragOrigin(DragGestureEvent e) {
+				return SwingUtilities.convertPoint(comp, e.getDragOrigin(), tabbedPane);
+			}
+		};
+		DragSource.getDefaultDragSource()
+				.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
+	}
+
 	private String buildTabTitle(JNode node) {
 		String tabTitle;
 		if (node.getRootClass() != null) {

diff --git a/...src/main/java/jadx/gui/ui/TabbedPane.java → ...main/java/jadx/gui/ui/tab/TabbedPane.java b/...src/main/java/jadx/gui/ui/TabbedPane.java → ...main/java/jadx/gui/ui/tab/TabbedPane.java
@@ -1,4 +1,4 @@
-package jadx.gui.ui;
+package jadx.gui.ui.tab;
 
 import java.awt.Component;
 import java.awt.KeyEventDispatcher;
@@ -26,6 +26,7 @@
 import jadx.core.utils.exceptions.JadxRuntimeException;
 import jadx.gui.treemodel.JClass;
 import jadx.gui.treemodel.JNode;
+import jadx.gui.ui.MainWindow;
 import jadx.gui.ui.codearea.AbstractCodeArea;
 import jadx.gui.ui.codearea.AbstractCodeContentPanel;
 import jadx.gui.ui.codearea.ClassCodeContentPanel;
@@ -35,6 +36,7 @@
 import jadx.gui.ui.panel.HtmlPanel;
 import jadx.gui.ui.panel.IViewStateSupport;
 import jadx.gui.ui.panel.ImagePanel;
+import jadx.gui.ui.tab.dnd.TabDndController;
 import jadx.gui.utils.JumpManager;
 import jadx.gui.utils.JumpPosition;
 import jadx.gui.utils.NLS;
@@ -52,12 +54,17 @@ public class TabbedPane extends JTabbedPane {
 	private transient ContentPanel curTab;
 	private transient ContentPanel lastTab;
 
-	TabbedPane(MainWindow window) {
+	private transient TabDndController dnd;
+
+	public TabbedPane(MainWindow window) {
 		this.mainWindow = window;
 
 		setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
 
 		addMouseWheelListener(event -> {
+			if (dnd != null && dnd.isDragging()) {
+				return;
+			}
 			int direction = event.getWheelRotation();
 			if (getTabCount() == 0 || direction == 0) {
 				return;
@@ -483,6 +490,14 @@ public Component getFocusedComp() {
 		return FocusManager.getFocusedComp();
 	}
 
+	public TabDndController getDnd() {
+		return dnd;
+	}
+
+	public void setDnd(TabDndController dnd) {
+		this.dnd = dnd;
+	}
+
 	private static class FocusManager implements FocusListener {
 		private static final FocusManager INSTANCE = new FocusManager();
 		private static @Nullable Component focusedComp;