Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/GP-1-dragonmacher-tab-icon-fix'
Ryan Kurtzf8eada2b7ceb
diff --cc Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.javaindex 435e0cf95e,5ddfd6fa9b..2eb1c941f0--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java@@@ -319,14 -314,15 +319,15 @@@ class ComponentNode extends NodeDockingTabRenderer tabRenderer =createTabRenderer(tabbedPane, placeholder, fullTitle, tabText, component);-c.installDragDropTarget(tabbedPane);+ tabRenderer.installPopupMenu(createTabPopupMenu(activeComponents, placeholder));tabbedPane.setTabComponentAt(i, tabRenderer);+Icon icon = placeholder.getIcon();- if (icon != null) {- tabRenderer.setIcon(icon);- }+ tabbedPane.setTitleAt(i, tabText);+ tabbedPane.setIconAt(i, icon);+ tabRenderer.setIcon(icon);if (placeholder == top) {activeIndex = i;