Merge pull request #497 from Bl3nd/master
Tabs and fix for splitpanes being reset during resize
This commit is contained in:
Konloch
GitHub
commit
13a35b12a9
|
|
@ -19,572 +19,15 @@
|
|||
package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
|
||||
|
||||
import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
|
||||
import the.bytecode.club.bytecodeviewer.BytecodeViewer;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.datatransfer.DataFlavor;
|
||||
import java.awt.datatransfer.Transferable;
|
||||
import java.awt.dnd.*;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
public class DraggableTabbedPane extends JTabbedPane {
|
||||
|
||||
public static final long serialVersionUID = 1L;
|
||||
private static final int LINEWIDTH = 3;
|
||||
private static final String NAME = "TabTransferData";
|
||||
private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME);
|
||||
private static final GhostGlassPane s_glassPane = new GhostGlassPane();
|
||||
|
||||
private boolean m_isDrawRect = false;
|
||||
private final Rectangle2D m_lineRect = new Rectangle2D.Double();
|
||||
|
||||
private final Color m_lineColor = new Color(0, 100, 255);
|
||||
private TabAcceptor m_acceptor;
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public DraggableTabbedPane() {
|
||||
super(SwingConstants.TOP, SCROLL_TAB_LAYOUT);
|
||||
this.putClientProperty(DarkTabbedPaneUI.KEY_DND, true);
|
||||
|
||||
/*if (!Configuration.showDarkLAFComponentIcons) {
|
||||
final DragSourceListener dsl = new DragSourceListener() {
|
||||
public void dragEnter(DragSourceDragEvent e) {
|
||||
e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
|
||||
}
|
||||
|
||||
public void dragExit(DragSourceEvent e) {
|
||||
e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
s_glassPane.setPoint(new Point(-1000, -1000));
|
||||
s_glassPane.repaint();
|
||||
}
|
||||
|
||||
public void dragOver(DragSourceDragEvent e) {
|
||||
TabTransferData data = getTabTransferData(e);
|
||||
if (data == null) {
|
||||
e.getDragSourceContext().setCursor(
|
||||
DragSource.DefaultMoveNoDrop);
|
||||
return;
|
||||
}
|
||||
|
||||
e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
|
||||
}
|
||||
|
||||
public void dragDropEnd(DragSourceDropEvent e) {
|
||||
m_isDrawRect = false;
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
if (hasGhost()) {
|
||||
s_glassPane.setVisible(false);
|
||||
s_glassPane.setImage(null);
|
||||
}
|
||||
}
|
||||
|
||||
public void dropActionChanged(DragSourceDragEvent e) {
|
||||
}
|
||||
};
|
||||
|
||||
final DragGestureListener dgl = e -> {
|
||||
Point tabPt = e.getDragOrigin();
|
||||
int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y);
|
||||
if (dragTabIndex < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex);
|
||||
try {
|
||||
e.startDrag(DragSource.DefaultMoveDrop, new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl);
|
||||
} catch (InvalidDnDOperationException idoe) {
|
||||
idoe.printStackTrace();
|
||||
}
|
||||
};
|
||||
|
||||
new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new CDropTargetListener(), true);
|
||||
new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
|
||||
m_acceptor = (a_component, a_index) -> true;
|
||||
}*/
|
||||
}
|
||||
|
||||
public TabAcceptor getAcceptor() {
|
||||
return m_acceptor;
|
||||
}
|
||||
|
||||
public void setAcceptor(TabAcceptor a_value) {
|
||||
m_acceptor = a_value;
|
||||
}
|
||||
|
||||
private TabTransferData getTabTransferData(DropTargetDropEvent a_event) {
|
||||
Transferable t = a_event.getTransferable();
|
||||
if (!t.isDataFlavorSupported(FLAVOR)) return null;
|
||||
|
||||
try {
|
||||
return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private TabTransferData getTabTransferData(DropTargetDragEvent a_event) {
|
||||
Transferable t = a_event.getTransferable();
|
||||
if (!t.isDataFlavorSupported(FLAVOR)) return null;
|
||||
|
||||
try {
|
||||
return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private TabTransferData getTabTransferData(DragSourceDragEvent a_event) {
|
||||
Transferable t = a_event.getDragSourceContext().getTransferable();
|
||||
if (!t.isDataFlavorSupported(FLAVOR)) return null;
|
||||
|
||||
try {
|
||||
return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
class TabTransferable implements Transferable {
|
||||
|
||||
private TabTransferData m_data = null;
|
||||
|
||||
public TabTransferable(DraggableTabbedPane a_tabbedPane, int a_tabIndex) {
|
||||
m_data = new TabTransferData(a_tabbedPane, a_tabIndex);
|
||||
}
|
||||
|
||||
public Object getTransferData(DataFlavor flavor) {
|
||||
return m_data;
|
||||
}
|
||||
|
||||
public DataFlavor[] getTransferDataFlavors() {
|
||||
DataFlavor[] f = new DataFlavor[1];
|
||||
f[0] = FLAVOR;
|
||||
return f;
|
||||
}
|
||||
|
||||
public boolean isDataFlavorSupported(DataFlavor flavor) {
|
||||
return flavor.getHumanPresentableName().equals(NAME);
|
||||
}
|
||||
}
|
||||
|
||||
static class TabTransferData {
|
||||
|
||||
private DraggableTabbedPane m_tabbedPane = null;
|
||||
private int m_tabIndex = -1;
|
||||
|
||||
public TabTransferData() {
|
||||
}
|
||||
|
||||
public TabTransferData(DraggableTabbedPane a_tabbedPane, int a_tabIndex) {
|
||||
m_tabbedPane = a_tabbedPane;
|
||||
m_tabIndex = a_tabIndex;
|
||||
}
|
||||
|
||||
public DraggableTabbedPane getTabbedPane() {
|
||||
return m_tabbedPane;
|
||||
}
|
||||
|
||||
public void setTabbedPane(DraggableTabbedPane pane) {
|
||||
m_tabbedPane = pane;
|
||||
}
|
||||
|
||||
public int getTabIndex() {
|
||||
return m_tabIndex;
|
||||
}
|
||||
|
||||
public void setTabIndex(int index) {
|
||||
m_tabIndex = index;
|
||||
}
|
||||
}
|
||||
|
||||
private Point buildGhostLocation(Point a_location) {
|
||||
Point retval = new Point(a_location);
|
||||
|
||||
switch (getTabPlacement()) {
|
||||
case JTabbedPane.TOP: {
|
||||
retval.y = 1;
|
||||
retval.x -= s_glassPane.getGhostWidth() / 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case JTabbedPane.BOTTOM: {
|
||||
retval.y = getHeight() - 1 - s_glassPane.getGhostHeight();
|
||||
retval.x -= s_glassPane.getGhostWidth() / 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case JTabbedPane.LEFT: {
|
||||
retval.x = 1;
|
||||
retval.y -= s_glassPane.getGhostHeight() / 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case JTabbedPane.RIGHT: {
|
||||
retval.x = getWidth() - 1 - s_glassPane.getGhostWidth();
|
||||
retval.y -= s_glassPane.getGhostHeight() / 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, retval, s_glassPane);
|
||||
return retval;
|
||||
}
|
||||
|
||||
class CDropTargetListener implements DropTargetListener {
|
||||
|
||||
public void dragEnter(DropTargetDragEvent e) {
|
||||
if (isDragAcceptable(e)) {
|
||||
e.acceptDrag(e.getDropAction());
|
||||
} else {
|
||||
e.rejectDrag();
|
||||
}
|
||||
}
|
||||
|
||||
public void dragExit(DropTargetEvent e) {
|
||||
m_isDrawRect = false;
|
||||
}
|
||||
|
||||
public void dropActionChanged(DropTargetDragEvent e) {
|
||||
}
|
||||
|
||||
public void dragOver(DropTargetDragEvent e) {
|
||||
TabTransferData data = getTabTransferData(e);
|
||||
if (data == null) return;
|
||||
|
||||
if (getTabPlacement() == JTabbedPane.TOP
|
||||
|| getTabPlacement() == JTabbedPane.BOTTOM) {
|
||||
initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data);
|
||||
} else {
|
||||
initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data);
|
||||
}
|
||||
|
||||
repaint();
|
||||
if (hasGhost()) {
|
||||
s_glassPane.setPoint(buildGhostLocation(e.getLocation()));
|
||||
s_glassPane.repaint();
|
||||
}
|
||||
}
|
||||
|
||||
public void drop(DropTargetDropEvent a_event) {
|
||||
if (isDropAcceptable(a_event)) {
|
||||
convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation()));
|
||||
a_event.dropComplete(true);
|
||||
} else {
|
||||
a_event.dropComplete(false);
|
||||
}
|
||||
|
||||
m_isDrawRect = false;
|
||||
repaint();
|
||||
|
||||
BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(getSelectedIndex(), new CloseButtonComponent(DraggableTabbedPane.this));
|
||||
}
|
||||
|
||||
public boolean isDragAcceptable(DropTargetDragEvent e) {
|
||||
Transferable t = e.getTransferable();
|
||||
if (t == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
DataFlavor[] flavor = e.getCurrentDataFlavors();
|
||||
if (!t.isDataFlavorSupported(flavor[0])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
TabTransferData data = getTabTransferData(e);
|
||||
if (data == null) return false;
|
||||
|
||||
if (DraggableTabbedPane.this == data.getTabbedPane()
|
||||
&& data.getTabIndex() >= 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (DraggableTabbedPane.this != data.getTabbedPane()) {
|
||||
if (m_acceptor != null) {
|
||||
return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isDropAcceptable(DropTargetDropEvent e) {
|
||||
Transferable t = e.getTransferable();
|
||||
if (t == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
DataFlavor[] flavor = e.getCurrentDataFlavors();
|
||||
if (!t.isDataFlavorSupported(flavor[0])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
TabTransferData data = getTabTransferData(e);
|
||||
if (data == null) return false;
|
||||
|
||||
if (DraggableTabbedPane.this == data.getTabbedPane()
|
||||
&& data.getTabIndex() >= 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (DraggableTabbedPane.this != data.getTabbedPane()) {
|
||||
if (m_acceptor != null) {
|
||||
return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean m_hasGhost = true;
|
||||
|
||||
public void setPaintGhost(boolean flag) {
|
||||
m_hasGhost = flag;
|
||||
}
|
||||
|
||||
public boolean hasGhost() {
|
||||
return m_hasGhost;
|
||||
}
|
||||
|
||||
/**
|
||||
* returns potential index for drop.
|
||||
*
|
||||
* @param a_point point given in the drop site component's coordinate
|
||||
* @return returns potential index for drop.
|
||||
*/
|
||||
private int getTargetTabIndex(Point a_point) {
|
||||
boolean isTopOrBottom = getTabPlacement() == JTabbedPane.TOP
|
||||
|| getTabPlacement() == JTabbedPane.BOTTOM;
|
||||
|
||||
// if the pane is empty, the target index is always zero.
|
||||
if (getTabCount() == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (int i = 0; i < getTabCount(); i++) {
|
||||
Rectangle r = getBoundsAt(i);
|
||||
if (isTopOrBottom) {
|
||||
r.setRect(r.x - r.width / 2D, r.y, r.width, r.height);
|
||||
} else {
|
||||
r.setRect(r.x, r.y - r.height / 2D, r.width, r.height);
|
||||
}
|
||||
|
||||
if (r.contains(a_point)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle r = getBoundsAt(getTabCount() - 1);
|
||||
if (isTopOrBottom) {
|
||||
int x = r.x + r.width / 2;
|
||||
r.setRect(x, r.y, getWidth() - x, r.height);
|
||||
} else {
|
||||
int y = r.y + r.height / 2;
|
||||
r.setRect(r.x, y, r.width, getHeight() - y);
|
||||
}
|
||||
|
||||
return r.contains(a_point) ? getTabCount() : -1;
|
||||
}
|
||||
|
||||
private void convertTab(TabTransferData a_data, int a_targetIndex) {
|
||||
if (a_data == null) return;
|
||||
|
||||
DraggableTabbedPane source = a_data.getTabbedPane();
|
||||
int sourceIndex = a_data.getTabIndex();
|
||||
if (sourceIndex < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
Component cmp = source.getComponentAt(sourceIndex);
|
||||
String str = source.getTitleAt(sourceIndex);
|
||||
if (this != source) {
|
||||
source.remove(sourceIndex);
|
||||
|
||||
if (a_targetIndex == getTabCount()) {
|
||||
addTab(str, cmp);
|
||||
} else {
|
||||
if (a_targetIndex < 0) {
|
||||
a_targetIndex = 0;
|
||||
}
|
||||
|
||||
insertTab(str, null, cmp, null, a_targetIndex);
|
||||
}
|
||||
|
||||
setSelectedComponent(cmp);
|
||||
return;
|
||||
}
|
||||
|
||||
if (a_targetIndex < 0 || sourceIndex == a_targetIndex) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (a_targetIndex == getTabCount()) {
|
||||
source.remove(sourceIndex);
|
||||
addTab(str, cmp);
|
||||
setSelectedIndex(getTabCount() - 1);
|
||||
} else if (sourceIndex > a_targetIndex) {
|
||||
source.remove(sourceIndex);
|
||||
insertTab(str, null, cmp, null, a_targetIndex);
|
||||
setSelectedIndex(a_targetIndex);
|
||||
} else {
|
||||
source.remove(sourceIndex);
|
||||
insertTab(str, null, cmp, null, a_targetIndex - 1);
|
||||
setSelectedIndex(a_targetIndex - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void initTargetLeftRightLine(int next, TabTransferData a_data) {
|
||||
if (next < 0) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (a_data == null) return;
|
||||
|
||||
if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
} else if (getTabCount() == 0) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
} else if (next == 0) {
|
||||
Rectangle rect = getBoundsAt(0);
|
||||
m_lineRect.setRect(-LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
|
||||
m_isDrawRect = true;
|
||||
} else if (next == getTabCount()) {
|
||||
Rectangle rect = getBoundsAt(getTabCount() - 1);
|
||||
m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
|
||||
m_isDrawRect = true;
|
||||
} else {
|
||||
Rectangle rect = getBoundsAt(next - 1);
|
||||
m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
|
||||
m_isDrawRect = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void initTargetTopBottomLine(int next, TabTransferData a_data) {
|
||||
if (next < 0) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (a_data == null) return;
|
||||
|
||||
if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
} else if (getTabCount() == 0) {
|
||||
m_lineRect.setRect(0, 0, 0, 0);
|
||||
m_isDrawRect = false;
|
||||
return;
|
||||
} else if (next == getTabCount()) {
|
||||
Rectangle rect = getBoundsAt(getTabCount() - 1);
|
||||
m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
|
||||
m_isDrawRect = true;
|
||||
} else if (next == 0) {
|
||||
Rectangle rect = getBoundsAt(0);
|
||||
m_lineRect.setRect(rect.x, -LINEWIDTH / 2D, rect.width, LINEWIDTH);
|
||||
m_isDrawRect = true;
|
||||
} else {
|
||||
Rectangle rect = getBoundsAt(next - 1);
|
||||
m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
|
||||
m_isDrawRect = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void initGlassPane(Component c, Point tabPt, int a_tabIndex) {
|
||||
getRootPane().setGlassPane(s_glassPane);
|
||||
if (hasGhost()) {
|
||||
Rectangle rect = getBoundsAt(a_tabIndex);
|
||||
BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics g = image.getGraphics();
|
||||
c.paint(g);
|
||||
image = image.getSubimage(rect.x, rect.y, rect.width, rect.height);
|
||||
s_glassPane.setImage(image);
|
||||
}
|
||||
|
||||
s_glassPane.setPoint(buildGhostLocation(tabPt));
|
||||
s_glassPane.setVisible(true);
|
||||
}
|
||||
|
||||
private Rectangle getTabAreaBound() {
|
||||
Rectangle lastTab = getUI().getTabBounds(this, getTabCount() - 1);
|
||||
return new Rectangle(0, 0, getWidth(), lastTab.y + lastTab.height);
|
||||
}
|
||||
|
||||
public void paintComponent(Graphics g) {
|
||||
super.paintComponent(g);
|
||||
|
||||
if (m_isDrawRect) {
|
||||
Graphics2D g2 = (Graphics2D) g;
|
||||
g2.setPaint(m_lineColor);
|
||||
g2.fill(m_lineRect);
|
||||
}
|
||||
}
|
||||
|
||||
public interface TabAcceptor {
|
||||
|
||||
boolean isDropAcceptable(DraggableTabbedPane a_component, int a_index);
|
||||
}
|
||||
}
|
||||
|
||||
class GhostGlassPane extends JPanel {
|
||||
|
||||
public static final long serialVersionUID = 1L;
|
||||
private final AlphaComposite m_composite;
|
||||
|
||||
private final Point m_location = new Point(0, 0);
|
||||
|
||||
private BufferedImage m_draggingGhost = null;
|
||||
|
||||
public GhostGlassPane() {
|
||||
setOpaque(false);
|
||||
m_composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f);
|
||||
}
|
||||
|
||||
public void setImage(BufferedImage draggingGhost) {
|
||||
m_draggingGhost = draggingGhost;
|
||||
}
|
||||
|
||||
public void setPoint(Point a_location) {
|
||||
m_location.x = a_location.x;
|
||||
m_location.y = a_location.y;
|
||||
}
|
||||
|
||||
public int getGhostWidth() {
|
||||
if (m_draggingGhost == null) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_draggingGhost.getWidth(this);
|
||||
}
|
||||
|
||||
public int getGhostHeight() {
|
||||
if (m_draggingGhost == null) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_draggingGhost.getHeight(this);
|
||||
}
|
||||
|
||||
public void paintComponent(Graphics g) {
|
||||
if (m_draggingGhost == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Graphics2D g2 = (Graphics2D) g;
|
||||
g2.setComposite(m_composite);
|
||||
g2.drawImage(m_draggingGhost, (int) m_location.getX(), (int) m_location.getY(), null);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,28 +19,31 @@
|
|||
package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
|
||||
|
||||
import com.github.weisj.darklaf.components.CloseButton;
|
||||
import the.bytecode.club.bytecodeviewer.BytecodeViewer;
|
||||
import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener;
|
||||
import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
|
||||
import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.MouseEvent;
|
||||
|
||||
public class CloseButtonComponent extends JPanel {
|
||||
public class TabComponent extends JPanel {
|
||||
|
||||
private final JTabbedPane pane;
|
||||
private JTabbedPane pane;
|
||||
|
||||
public CloseButtonComponent(JTabbedPane pane) {
|
||||
public TabComponent(JTabbedPane pane) {
|
||||
super(new FlowLayout(FlowLayout.LEFT, 0, 0));
|
||||
if (pane == null) {
|
||||
throw new NullPointerException("TabbedPane is null");
|
||||
}
|
||||
|
||||
this.pane = pane;
|
||||
|
||||
setOpaque(false);
|
||||
JLabel label = new JLabel() {
|
||||
public String getText() {
|
||||
int i = pane.indexOfTabComponent(CloseButtonComponent.this);
|
||||
int i = pane.indexOfTabComponent(TabComponent.this);
|
||||
if (i != -1) {
|
||||
return pane.getTitleAt(i);
|
||||
}
|
||||
|
|
@ -49,8 +52,8 @@ public class CloseButtonComponent extends JPanel {
|
|||
}
|
||||
};
|
||||
|
||||
add(label);
|
||||
label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
|
||||
add(label);
|
||||
JButton button = new CloseButton();
|
||||
add(button);
|
||||
|
||||
|
|
@ -67,15 +70,20 @@ public class CloseButtonComponent extends JPanel {
|
|||
if (e.getButton() != MouseEvent.BUTTON1) // left-click
|
||||
return;
|
||||
|
||||
if (pane.indexOfTabComponent(CloseButtonComponent.this) != -1)
|
||||
pane.remove(pane.indexOfTabComponent(CloseButtonComponent.this));
|
||||
if (pane.indexOfTabComponent(TabComponent.this) != -1) {
|
||||
int i = pane.indexOfTabComponent(TabComponent.this);
|
||||
removeTab(i);
|
||||
}
|
||||
}));
|
||||
|
||||
closeTab.addActionListener(e ->
|
||||
{
|
||||
if (pane.indexOfTabComponent(CloseButtonComponent.this) != -1)
|
||||
pane.remove(pane.indexOfTabComponent(CloseButtonComponent.this));
|
||||
if (pane.indexOfTabComponent(TabComponent.this) != -1) {
|
||||
int i = pane.indexOfTabComponent(TabComponent.this);
|
||||
removeTab(i);
|
||||
}
|
||||
});
|
||||
|
||||
closeAllTabs.addActionListener(e ->
|
||||
{
|
||||
|
||||
|
|
@ -83,14 +91,21 @@ public class CloseButtonComponent extends JPanel {
|
|||
if (pane.getTabCount() <= 1)
|
||||
return;
|
||||
|
||||
if (pane.indexOfTabComponent(CloseButtonComponent.this) != 0)
|
||||
pane.remove(0);
|
||||
else
|
||||
pane.remove(1);
|
||||
if (pane.indexOfTabComponent(TabComponent.this) != 0) {
|
||||
removeTab(0);
|
||||
} else {
|
||||
removeTab(1);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
|
||||
}
|
||||
|
||||
private void removeTab(int index) {
|
||||
ResourceViewer resourceViewer = (ResourceViewer) BytecodeViewer.viewer.workPane.tabs.getComponentAt(index);
|
||||
BytecodeViewer.viewer.workPane.openedTabs.remove(resourceViewer.resource.workingName);
|
||||
pane.remove(index);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -27,6 +27,9 @@ import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer
|
|||
/**
|
||||
* @author Konloch
|
||||
* @since 6/24/2021
|
||||
* @deprecated Removal pending. <br>
|
||||
* Disabled due to a bug when dragging a component, it got "removed" resulting in another
|
||||
* tab being opened when clicking the same class in the file resource rather than opening the already opened file.
|
||||
*/
|
||||
public class TabRemovalEvent implements ContainerListener
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ public class Workspace extends TranslatedVisibleComponent {
|
|||
|
||||
getContentPane().add(buttonPanel, BorderLayout.SOUTH);
|
||||
|
||||
tabs.addContainerListener(new TabRemovalEvent());
|
||||
tabs.addChangeListener(arg0 -> buttonPanel.setVisible(tabs.getSelectedIndex() != -1));
|
||||
|
||||
this.setVisible(true);
|
||||
|
|
@ -147,7 +146,7 @@ public class Workspace extends TranslatedVisibleComponent {
|
|||
resourceView.resource.workingName = workingName;
|
||||
|
||||
//set the tabs index
|
||||
tabs.setTabComponentAt(tabIndex, new CloseButtonComponent(tabs));
|
||||
tabs.setTabComponentAt(tabIndex, new TabComponent(tabs));
|
||||
|
||||
//open the tab that was just added
|
||||
tabs.setSelectedIndex(tabIndex);
|
||||
|
|
|
|||
|
|
@ -64,18 +64,8 @@ public class ClassViewer extends ResourceViewer
|
|||
|
||||
this.setName(name);
|
||||
this.setLayout(new BorderLayout());
|
||||
this.sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, bytecodeViewPanel1, bytecodeViewPanel2);
|
||||
this.sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp, bytecodeViewPanel3);
|
||||
this.add(sp2, BorderLayout.CENTER);
|
||||
|
||||
this.addComponentListener(new ComponentAdapter()
|
||||
{
|
||||
@Override
|
||||
public void componentResized(ComponentEvent e)
|
||||
{
|
||||
resetDivider();
|
||||
}
|
||||
});
|
||||
this.sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -290,34 +280,58 @@ public class ClassViewer extends ResourceViewer
|
|||
|
||||
public void resetDivider()
|
||||
{
|
||||
/*
|
||||
This may be a bit overkill on how we handle setting/changing selected panels, but we now handle if only one panel is
|
||||
selected, to not show any split panes but just the panel text.
|
||||
*/
|
||||
|
||||
SwingUtilities.invokeLater(() ->
|
||||
{
|
||||
sp.setResizeWeight(0.5);
|
||||
// This clears any component so we can "repaint" our components based on the users selections
|
||||
for (Component c : this.getComponents()) {
|
||||
if (c instanceof BytecodeViewPanel || c instanceof JSplitPane) {
|
||||
this.remove(c);
|
||||
}
|
||||
}
|
||||
|
||||
if (bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE)
|
||||
setDividerLocation(sp, 0.5);
|
||||
else if (bytecodeViewPanel1.decompiler != Decompiler.NONE)
|
||||
setDividerLocation(sp, 1);
|
||||
else if (bytecodeViewPanel2.decompiler != Decompiler.NONE)
|
||||
{
|
||||
sp.setResizeWeight(1);
|
||||
setDividerLocation(sp, 0);
|
||||
} else
|
||||
setDividerLocation(sp, 0);
|
||||
this.sp.setResizeWeight(0.5);
|
||||
setDividerLocation(sp, 0.5);
|
||||
|
||||
if (bytecodeViewPanel3.decompiler != Decompiler.NONE)
|
||||
{
|
||||
sp2.setResizeWeight(0.7);
|
||||
setDividerLocation(sp2, 0.7);
|
||||
if ((bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE) || (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE))
|
||||
setDividerLocation(sp2, 0.5);
|
||||
else if (bytecodeViewPanel1.decompiler == Decompiler.NONE)
|
||||
setDividerLocation(sp2, 0);
|
||||
} else
|
||||
{
|
||||
sp.setResizeWeight(1);
|
||||
sp2.setResizeWeight(0);
|
||||
setDividerLocation(sp2, 1);
|
||||
/* If panel 1 and panel 2 are ticked but not panel 3 */
|
||||
if (bytecodeViewPanel1.decompiler != Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel3.decompiler == Decompiler.NONE) {
|
||||
this.sp.setLeftComponent(bytecodeViewPanel1);
|
||||
this.sp.setRightComponent(bytecodeViewPanel2);
|
||||
this.add(sp, BorderLayout.CENTER);
|
||||
} /* If panel 1 and panel 3 are ticked but not panel 2 */
|
||||
else if (bytecodeViewPanel1.decompiler != Decompiler.NONE && bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel3.decompiler != Decompiler.NONE) {
|
||||
this.sp.setLeftComponent(bytecodeViewPanel1);
|
||||
this.sp.setRightComponent(bytecodeViewPanel3);
|
||||
this.add(sp, BorderLayout.CENTER);
|
||||
} /* If panel 2 and panel 3 are ticked but not panel 1 */
|
||||
else if (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel3.decompiler != Decompiler.NONE) {
|
||||
this.sp.setLeftComponent(bytecodeViewPanel2);
|
||||
this.sp.setRightComponent(bytecodeViewPanel3);
|
||||
this.add(sp, BorderLayout.CENTER);
|
||||
}
|
||||
|
||||
// If all panels are selected, create the second split pane
|
||||
if (bytecodeViewPanel1.decompiler != Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel3.decompiler != Decompiler.NONE) {
|
||||
this.sp.setLeftComponent(bytecodeViewPanel1);
|
||||
this.sp.setRightComponent(bytecodeViewPanel2);
|
||||
this.sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp, bytecodeViewPanel3);
|
||||
this.sp2.setResizeWeight(0.7);
|
||||
this.add(sp2);
|
||||
}
|
||||
|
||||
/* If view panel 1 is only ticked... */
|
||||
if (bytecodeViewPanel1.decompiler != Decompiler.NONE && bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel3.decompiler == Decompiler.NONE) {
|
||||
this.add(bytecodeViewPanel1, BorderLayout.CENTER);
|
||||
} /* If view panel 2 is only ticked... */
|
||||
else if (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel3.decompiler == Decompiler.NONE) {
|
||||
this.add(bytecodeViewPanel2, BorderLayout.CENTER);
|
||||
} /* If view panel 3 is only ticked... */
|
||||
else if (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel3.decompiler != Decompiler.NONE){
|
||||
this.add(bytecodeViewPanel3, BorderLayout.CENTER);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user