Removed last version of dnd. Added dnd support from weisJ theme. Also, I fixed a problem not being able to scroll when a class is open and switching themes. Not sure if it was happening to just me or not.

This commit is contained in:
Cody 2023-04-09 17:17:37 -07:00
parent ca894b3d16
commit e6cdd92bae
4 changed files with 120 additions and 220 deletions

View file

@ -1,24 +1,16 @@
package the.bytecode.club.bytecodeviewer.gui.resourceviewer; package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
import com.android.tools.r8.internal.Cl;
import com.github.weisj.darklaf.components.CloseButton; import com.github.weisj.darklaf.components.CloseButton;
import com.github.weisj.darklaf.listener.MouseClickListener;
import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener; import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener;
import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
public class CloseButtonComponent extends JPanel { public class CloseButtonComponent extends JPanel {
private final JTabbedPane pane; private final JTabbedPane pane;
String title = "";
public CloseButtonComponent(final JTabbedPane pane) { public CloseButtonComponent(final JTabbedPane pane) {
super(new FlowLayout(FlowLayout.LEFT, 0, 0)); super(new FlowLayout(FlowLayout.LEFT, 0, 0));
if (pane == null) { if (pane == null) {

View file

@ -1,5 +1,6 @@
package the.bytecode.club.bytecodeviewer.gui.resourceviewer; package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.BytecodeViewer;
import javax.swing.*; import javax.swing.*;
@ -16,17 +17,19 @@ public class DraggableTabbedPane extends JTabbedPane {
private static final int LINEWIDTH = 3; private static final int LINEWIDTH = 3;
private static final String NAME = "TabTransferData"; private static final String NAME = "TabTransferData";
private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME); private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME);
private static GhostGlassPane s_glassPane = new GhostGlassPane(); private static final GhostGlassPane s_glassPane = new GhostGlassPane();
private boolean m_isDrawRect = false; private boolean m_isDrawRect = false;
private final Rectangle2D m_lineRect = new Rectangle2D.Double(); private final Rectangle2D m_lineRect = new Rectangle2D.Double();
private final Color m_lineColor = new Color(0, 100, 255); private final Color m_lineColor = new Color(0, 100, 255);
private TabAcceptor m_acceptor = null; private TabAcceptor m_acceptor;
public DraggableTabbedPane() { public DraggableTabbedPane() {
super(SwingConstants.TOP, SCROLL_TAB_LAYOUT); super(SwingConstants.TOP, SCROLL_TAB_LAYOUT);
this.putClientProperty(DarkTabbedPaneUI.KEY_DND, true);
/*if (!Configuration.showDarkLAFComponentIcons) {
final DragSourceListener dsl = new DragSourceListener() { final DragSourceListener dsl = new DragSourceListener() {
public void dragEnter(DragSourceDragEvent e) { public void dragEnter(DragSourceDragEvent e) {
e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop); e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
@ -41,47 +44,19 @@ public class DraggableTabbedPane extends JTabbedPane {
} }
public void dragOver(DragSourceDragEvent e) { public void dragOver(DragSourceDragEvent e) {
//e.getLocation()
//This method returns a Point indicating the cursor location in screen coordinates at the moment
TabTransferData data = getTabTransferData(e); TabTransferData data = getTabTransferData(e);
if (data == null) { if (data == null) {
e.getDragSourceContext().setCursor( e.getDragSourceContext().setCursor(
DragSource.DefaultMoveNoDrop); DragSource.DefaultMoveNoDrop);
return; return;
} // if }
/* e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
Point tabPt = e.getLocation();
SwingUtilities.convertPointFromScreen(tabPt, DnDTabbedPane.this);
if (DnDTabbedPane.this.contains(tabPt)) {
int targetIdx = getTargetTabIndex(tabPt);
int sourceIndex = data.getTabIndex();
if (getTabAreaBound().contains(tabPt)
&& (targetIdx >= 0)
&& (targetIdx != sourceIndex)
&& (targetIdx != sourceIndex + 1)) {
e.getDragSourceContext().setCursor(
DragSource.DefaultMoveDrop);
return;
} // if
e.getDragSourceContext().setCursor(
DragSource.DefaultMoveNoDrop);
return;
} // if
*/
e.getDragSourceContext().setCursor(
DragSource.DefaultMoveDrop);
} }
public void dragDropEnd(DragSourceDropEvent e) { public void dragDropEnd(DragSourceDropEvent e) {
m_isDrawRect = false; m_isDrawRect = false;
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
// m_dragTabIndex = -1;
if (hasGhost()) { if (hasGhost()) {
s_glassPane.setVisible(false); s_glassPane.setVisible(false);
s_glassPane.setImage(null); s_glassPane.setImage(null);
@ -93,29 +68,24 @@ public class DraggableTabbedPane extends JTabbedPane {
}; };
final DragGestureListener dgl = e -> { final DragGestureListener dgl = e -> {
// System.out.println("dragGestureRecognized");
Point tabPt = e.getDragOrigin(); Point tabPt = e.getDragOrigin();
int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y); int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y);
if (dragTabIndex < 0) { if (dragTabIndex < 0) {
return; return;
} // if }
initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex); initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex);
try { try {
e.startDrag(DragSource.DefaultMoveDrop, e.startDrag(DragSource.DefaultMoveDrop, new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl);
new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl);
} catch (InvalidDnDOperationException idoe) { } catch (InvalidDnDOperationException idoe) {
idoe.printStackTrace(); idoe.printStackTrace();
} }
}; };
//dropTarget = new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new CDropTargetListener(), true);
new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
new CDropTargetListener(), true);
new DragSource().createDefaultDragGestureRecognizer(this,
DnDConstants.ACTION_COPY_OR_MOVE, dgl);
m_acceptor = (a_component, a_index) -> true; m_acceptor = (a_component, a_index) -> true;
}*/
} }
public TabAcceptor getAcceptor() { public TabAcceptor getAcceptor() {
@ -131,7 +101,7 @@ public class DraggableTabbedPane extends JTabbedPane {
if (!t.isDataFlavorSupported(FLAVOR)) return null; if (!t.isDataFlavorSupported(FLAVOR)) return null;
try { try {
return (TabTransferData) t.getTransferData(FLAVOR); return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -144,7 +114,7 @@ public class DraggableTabbedPane extends JTabbedPane {
if (!t.isDataFlavorSupported(FLAVOR)) return null; if (!t.isDataFlavorSupported(FLAVOR)) return null;
try { try {
return (TabTransferData) t.getTransferData(FLAVOR); return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -157,7 +127,7 @@ public class DraggableTabbedPane extends JTabbedPane {
if (!t.isDataFlavorSupported(FLAVOR)) return null; if (!t.isDataFlavorSupported(FLAVOR)) return null;
try { try {
return (TabTransferData) t.getTransferData(FLAVOR); return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -175,7 +145,6 @@ public class DraggableTabbedPane extends JTabbedPane {
public Object getTransferData(DataFlavor flavor) { public Object getTransferData(DataFlavor flavor) {
return m_data; return m_data;
// return DnDTabbedPane.this;
} }
public DataFlavor[] getTransferDataFlavors() { public DataFlavor[] getTransferDataFlavors() {
@ -246,27 +215,23 @@ public class DraggableTabbedPane extends JTabbedPane {
retval.y -= s_glassPane.getGhostHeight() / 2; retval.y -= s_glassPane.getGhostHeight() / 2;
} }
break; break;
} // switch }
retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, retval, s_glassPane);
retval, s_glassPane);
return retval; return retval;
} }
class CDropTargetListener implements DropTargetListener { class CDropTargetListener implements DropTargetListener {
public void dragEnter(DropTargetDragEvent e) { public void dragEnter(DropTargetDragEvent e) {
// System.out.println("DropTarget.dragEnter: " + DnDTabbedPane.this);
if (isDragAcceptable(e)) { if (isDragAcceptable(e)) {
e.acceptDrag(e.getDropAction()); e.acceptDrag(e.getDropAction());
} else { } else {
e.rejectDrag(); e.rejectDrag();
} // if }
} }
public void dragExit(DropTargetEvent e) { public void dragExit(DropTargetEvent e) {
// System.out.println("DropTarget.dragExit: " + DnDTabbedPane.this);
m_isDrawRect = false; m_isDrawRect = false;
} }
@ -282,7 +247,7 @@ public class DraggableTabbedPane extends JTabbedPane {
initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data); initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data);
} else { } else {
initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data); initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data);
} // if-else }
repaint(); repaint();
if (hasGhost()) { if (hasGhost()) {
@ -292,14 +257,12 @@ public class DraggableTabbedPane extends JTabbedPane {
} }
public void drop(DropTargetDropEvent a_event) { public void drop(DropTargetDropEvent a_event) {
// System.out.println("DropTarget.drop: " + DnDTabbedPane.this);
if (isDropAcceptable(a_event)) { if (isDropAcceptable(a_event)) {
convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation())); convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation()));
a_event.dropComplete(true); a_event.dropComplete(true);
} else { } else {
a_event.dropComplete(false); a_event.dropComplete(false);
} // if-else }
m_isDrawRect = false; m_isDrawRect = false;
repaint(); repaint();
@ -311,12 +274,12 @@ public class DraggableTabbedPane extends JTabbedPane {
Transferable t = e.getTransferable(); Transferable t = e.getTransferable();
if (t == null) { if (t == null) {
return false; return false;
} // if }
DataFlavor[] flavor = e.getCurrentDataFlavors(); DataFlavor[] flavor = e.getCurrentDataFlavors();
if (!t.isDataFlavorSupported(flavor[0])) { if (!t.isDataFlavorSupported(flavor[0])) {
return false; return false;
} // if }
TabTransferData data = getTabTransferData(e); TabTransferData data = getTabTransferData(e);
if (data == null) return false; if (data == null) return false;
@ -324,13 +287,13 @@ public class DraggableTabbedPane extends JTabbedPane {
if (DraggableTabbedPane.this == data.getTabbedPane() if (DraggableTabbedPane.this == data.getTabbedPane()
&& data.getTabIndex() >= 0) { && data.getTabIndex() >= 0) {
return true; return true;
} // if }
if (DraggableTabbedPane.this != data.getTabbedPane()) { if (DraggableTabbedPane.this != data.getTabbedPane()) {
if (m_acceptor != null) { if (m_acceptor != null) {
return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
} // if }
} // if }
return false; return false;
} }
@ -339,12 +302,12 @@ public class DraggableTabbedPane extends JTabbedPane {
Transferable t = e.getTransferable(); Transferable t = e.getTransferable();
if (t == null) { if (t == null) {
return false; return false;
} // if }
DataFlavor[] flavor = e.getCurrentDataFlavors(); DataFlavor[] flavor = e.getCurrentDataFlavors();
if (!t.isDataFlavorSupported(flavor[0])) { if (!t.isDataFlavorSupported(flavor[0])) {
return false; return false;
} // if }
TabTransferData data = getTabTransferData(e); TabTransferData data = getTabTransferData(e);
if (data == null) return false; if (data == null) return false;
@ -352,13 +315,13 @@ public class DraggableTabbedPane extends JTabbedPane {
if (DraggableTabbedPane.this == data.getTabbedPane() if (DraggableTabbedPane.this == data.getTabbedPane()
&& data.getTabIndex() >= 0) { && data.getTabIndex() >= 0) {
return true; return true;
} // if }
if (DraggableTabbedPane.this != data.getTabbedPane()) { if (DraggableTabbedPane.this != data.getTabbedPane()) {
if (m_acceptor != null) { if (m_acceptor != null) {
return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
} // if }
} // if }
return false; return false;
} }
@ -387,20 +350,20 @@ public class DraggableTabbedPane extends JTabbedPane {
// if the pane is empty, the target index is always zero. // if the pane is empty, the target index is always zero.
if (getTabCount() == 0) { if (getTabCount() == 0) {
return 0; return 0;
} // if }
for (int i = 0; i < getTabCount(); i++) { for (int i = 0; i < getTabCount(); i++) {
Rectangle r = getBoundsAt(i); Rectangle r = getBoundsAt(i);
if (isTopOrBottom) { if (isTopOrBottom) {
r.setRect(r.x - r.width / 2, r.y, r.width, r.height); r.setRect(r.x - r.width / 2D, r.y, r.width, r.height);
} else { } else {
r.setRect(r.x, r.y - r.height / 2, r.width, r.height); r.setRect(r.x, r.y - r.height / 2D, r.width, r.height);
} // if-else }
if (r.contains(a_point)) { if (r.contains(a_point)) {
return i; return i;
} // if }
} // for }
Rectangle r = getBoundsAt(getTabCount() - 1); Rectangle r = getBoundsAt(getTabCount() - 1);
if (isTopOrBottom) { if (isTopOrBottom) {
@ -409,18 +372,19 @@ public class DraggableTabbedPane extends JTabbedPane {
} else { } else {
int y = r.y + r.height / 2; int y = r.y + r.height / 2;
r.setRect(r.x, y, r.width, getHeight() - y); r.setRect(r.x, y, r.width, getHeight() - y);
} // if-else }
return r.contains(a_point) ? getTabCount() : -1; return r.contains(a_point) ? getTabCount() : -1;
} }
private void convertTab(TabTransferData a_data, int a_targetIndex) { private void convertTab(TabTransferData a_data, int a_targetIndex) {
if (a_data == null) return; if (a_data == null) return;
DraggableTabbedPane source = a_data.getTabbedPane(); DraggableTabbedPane source = a_data.getTabbedPane();
int sourceIndex = a_data.getTabIndex(); int sourceIndex = a_data.getTabIndex();
if (sourceIndex < 0) { if (sourceIndex < 0) {
return; return;
} // if }
Component cmp = source.getComponentAt(sourceIndex); Component cmp = source.getComponentAt(sourceIndex);
String str = source.getTitleAt(sourceIndex); String str = source.getTitleAt(sourceIndex);
@ -432,34 +396,28 @@ public class DraggableTabbedPane extends JTabbedPane {
} else { } else {
if (a_targetIndex < 0) { if (a_targetIndex < 0) {
a_targetIndex = 0; a_targetIndex = 0;
} // if }
insertTab(str, null, cmp, null, a_targetIndex); insertTab(str, null, cmp, null, a_targetIndex);
}
} // if
setSelectedComponent(cmp); setSelectedComponent(cmp);
// System.out.println("press="+sourceIndex+" next="+a_targetIndex);
return; return;
} // if }
if (a_targetIndex < 0 || sourceIndex == a_targetIndex) { if (a_targetIndex < 0 || sourceIndex == a_targetIndex) {
//System.out.println("press="+prev+" next="+next);
return; return;
} // if }
if (a_targetIndex == getTabCount()) { if (a_targetIndex == getTabCount()) {
//System.out.println("last: press="+prev+" next="+next);
source.remove(sourceIndex); source.remove(sourceIndex);
addTab(str, cmp); addTab(str, cmp);
setSelectedIndex(getTabCount() - 1); setSelectedIndex(getTabCount() - 1);
} else if (sourceIndex > a_targetIndex) { } else if (sourceIndex > a_targetIndex) {
//System.out.println(" >: press="+prev+" next="+next);
source.remove(sourceIndex); source.remove(sourceIndex);
insertTab(str, null, cmp, null, a_targetIndex); insertTab(str, null, cmp, null, a_targetIndex);
setSelectedIndex(a_targetIndex); setSelectedIndex(a_targetIndex);
} else { } else {
//System.out.println(" <: press="+prev+" next="+next);
source.remove(sourceIndex); source.remove(sourceIndex);
insertTab(str, null, cmp, null, a_targetIndex - 1); insertTab(str, null, cmp, null, a_targetIndex - 1);
setSelectedIndex(a_targetIndex - 1); setSelectedIndex(a_targetIndex - 1);
@ -471,31 +429,27 @@ public class DraggableTabbedPane extends JTabbedPane {
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
m_isDrawRect = false; m_isDrawRect = false;
return; return;
} // if }
if (a_data == null) return; if (a_data == null) return;
if ((a_data.getTabbedPane() == this) if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
&& (a_data.getTabIndex() == next
|| next - a_data.getTabIndex() == 1)) {
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
m_isDrawRect = false; m_isDrawRect = false;
} else if (getTabCount() == 0) { } else if (getTabCount() == 0) {
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
m_isDrawRect = false; m_isDrawRect = false;
return;
} else if (next == 0) { } else if (next == 0) {
Rectangle rect = getBoundsAt(0); Rectangle rect = getBoundsAt(0);
m_lineRect.setRect(-LINEWIDTH / 2, rect.y, LINEWIDTH, rect.height); m_lineRect.setRect(-LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
m_isDrawRect = true; m_isDrawRect = true;
} else if (next == getTabCount()) { } else if (next == getTabCount()) {
Rectangle rect = getBoundsAt(getTabCount() - 1); Rectangle rect = getBoundsAt(getTabCount() - 1);
m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
LINEWIDTH, rect.height);
m_isDrawRect = true; m_isDrawRect = true;
} else { } else {
Rectangle rect = getBoundsAt(next - 1); Rectangle rect = getBoundsAt(next - 1);
m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
LINEWIDTH, rect.height);
m_isDrawRect = true; m_isDrawRect = true;
} }
} }
@ -505,12 +459,11 @@ public class DraggableTabbedPane extends JTabbedPane {
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
m_isDrawRect = false; m_isDrawRect = false;
return; return;
} // if }
if (a_data == null) return; if (a_data == null) return;
if ((a_data.getTabbedPane() == this) if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
&& (a_data.getTabIndex() == next
|| next - a_data.getTabIndex() == 1)) {
m_lineRect.setRect(0, 0, 0, 0); m_lineRect.setRect(0, 0, 0, 0);
m_isDrawRect = false; m_isDrawRect = false;
} else if (getTabCount() == 0) { } else if (getTabCount() == 0) {
@ -519,33 +472,29 @@ public class DraggableTabbedPane extends JTabbedPane {
return; return;
} else if (next == getTabCount()) { } else if (next == getTabCount()) {
Rectangle rect = getBoundsAt(getTabCount() - 1); Rectangle rect = getBoundsAt(getTabCount() - 1);
m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
rect.width, LINEWIDTH);
m_isDrawRect = true; m_isDrawRect = true;
} else if (next == 0) { } else if (next == 0) {
Rectangle rect = getBoundsAt(0); Rectangle rect = getBoundsAt(0);
m_lineRect.setRect(rect.x, -LINEWIDTH / 2, rect.width, LINEWIDTH); m_lineRect.setRect(rect.x, -LINEWIDTH / 2D, rect.width, LINEWIDTH);
m_isDrawRect = true; m_isDrawRect = true;
} else { } else {
Rectangle rect = getBoundsAt(next - 1); Rectangle rect = getBoundsAt(next - 1);
m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
rect.width, LINEWIDTH);
m_isDrawRect = true; m_isDrawRect = true;
} }
} }
private void initGlassPane(Component c, Point tabPt, int a_tabIndex) { private void initGlassPane(Component c, Point tabPt, int a_tabIndex) {
//Point p = (Point) pt.clone();
getRootPane().setGlassPane(s_glassPane); getRootPane().setGlassPane(s_glassPane);
if (hasGhost()) { if (hasGhost()) {
Rectangle rect = getBoundsAt(a_tabIndex); Rectangle rect = getBoundsAt(a_tabIndex);
BufferedImage image = new BufferedImage(c.getWidth(), BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
c.getHeight(), BufferedImage.TYPE_INT_ARGB);
Graphics g = image.getGraphics(); Graphics g = image.getGraphics();
c.paint(g); c.paint(g);
image = image.getSubimage(rect.x, rect.y, rect.width, rect.height); image = image.getSubimage(rect.x, rect.y, rect.width, rect.height);
s_glassPane.setImage(image); s_glassPane.setImage(image);
} // if }
s_glassPane.setPoint(buildGhostLocation(tabPt)); s_glassPane.setPoint(buildGhostLocation(tabPt));
s_glassPane.setVisible(true); s_glassPane.setVisible(true);
@ -563,7 +512,7 @@ public class DraggableTabbedPane extends JTabbedPane {
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setPaint(m_lineColor); g2.setPaint(m_lineColor);
g2.fill(m_lineRect); g2.fill(m_lineRect);
} // if }
} }
public interface TabAcceptor { public interface TabAcceptor {
@ -577,7 +526,7 @@ class GhostGlassPane extends JPanel {
public static final long serialVersionUID = 1L; public static final long serialVersionUID = 1L;
private final AlphaComposite m_composite; private final AlphaComposite m_composite;
private Point m_location = new Point(0, 0); private final Point m_location = new Point(0, 0);
private BufferedImage m_draggingGhost = null; private BufferedImage m_draggingGhost = null;
@ -598,7 +547,7 @@ class GhostGlassPane extends JPanel {
public int getGhostWidth() { public int getGhostWidth() {
if (m_draggingGhost == null) { if (m_draggingGhost == null) {
return 0; return 0;
} // if }
return m_draggingGhost.getWidth(this); return m_draggingGhost.getWidth(this);
} }
@ -606,7 +555,7 @@ class GhostGlassPane extends JPanel {
public int getGhostHeight() { public int getGhostHeight() {
if (m_draggingGhost == null) { if (m_draggingGhost == null) {
return 0; return 0;
} // if }
return m_draggingGhost.getHeight(this); return m_draggingGhost.getHeight(this);
} }
@ -614,7 +563,7 @@ class GhostGlassPane extends JPanel {
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
if (m_draggingGhost == null) { if (m_draggingGhost == null) {
return; return;
} // if }
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setComposite(m_composite); g2.setComposite(m_composite);

View file

@ -1,22 +1,13 @@
package the.bytecode.club.bytecodeviewer.gui.resourceviewer; package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
import java.awt.Color;
import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.*;
import com.github.weisj.darklaf.components.CloseButton;
import the.bytecode.club.bytecodeviewer.BytecodeViewer;
import the.bytecode.club.bytecodeviewer.gui.components.ButtonHoverAnimation; import the.bytecode.club.bytecodeviewer.gui.components.ButtonHoverAnimation;
import the.bytecode.club.bytecodeviewer.gui.components.MaxWidthJLabel; import the.bytecode.club.bytecodeviewer.gui.components.MaxWidthJLabel;
import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener;
import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer; import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
import the.bytecode.club.bytecodeviewer.gui.util.DelayTabbedPaneThread; import the.bytecode.club.bytecodeviewer.gui.util.DelayTabbedPaneThread;
import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseListener;
/*************************************************************************** /***************************************************************************
* Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite * * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite *
@ -56,7 +47,7 @@ public class TabbedPane extends JPanel {
public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation(); public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation();
public static final Color BLANK_COLOR = new Color(0, 0, 0, 0); public static final Color BLANK_COLOR = new Color(0, 0, 0, 0);
public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final DraggableTabbedPane existingTabs, ResourceViewer resource) { public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final JTabbedPane existingTabs, ResourceViewer resource) {
// unset default FlowLayout' gaps // unset default FlowLayout' gaps
super(new FlowLayout(FlowLayout.LEFT, 0, 0)); super(new FlowLayout(FlowLayout.LEFT, 0, 0));
@ -80,33 +71,5 @@ public class TabbedPane extends JPanel {
setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
} }
public void onMousePressed(MouseEvent e)
{
BytecodeViewer.viewer.workPane.tabs.dispatchEvent(e);
if(e.getButton() == 1)
{
startedDragging = System.currentTimeMillis();
//dragging = true;
if (probablyABadIdea != null)
probablyABadIdea.stopped = true;
probablyABadIdea = new DelayTabbedPaneThread(TabbedPane.this);
probablyABadIdea.start();
repaint();
Rectangle bounds = new Rectangle(e.getX(), e.getY(), e.getX() + this.getX(), e.getY());
for(int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++)
{
Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i);
if(c != null && bounds.intersects(c.getBounds()))
BytecodeViewer.viewer.workPane.tabs.setSelectedIndex(i);
}
}
}
private static final long serialVersionUID = -4774885688297538774L; private static final long serialVersionUID = -4774885688297538774L;
/*public int getTabIndex() {
return tabs.indexOfTabComponent(this);
}*/
} }

View file

@ -1,16 +1,5 @@
package the.bytecode.club.bytecodeviewer.gui.resourceviewer; package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.HashSet;
import java.util.Set;
import javax.swing.JButton;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import com.github.weisj.darklaf.components.CloseButton;
import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.BytecodeViewer;
import the.bytecode.club.bytecodeviewer.decompilers.Decompiler; import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer; import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
@ -22,6 +11,13 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton; import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent; import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.HashSet;
import java.util.Set;
import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
/*************************************************************************** /***************************************************************************
@ -52,7 +48,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
public class Workspace extends TranslatedVisibleComponent { public class Workspace extends TranslatedVisibleComponent {
public final DraggableTabbedPane tabs; public JTabbedPane tabs;
public final JPanel buttonPanel; public final JPanel buttonPanel;
public final JButton refreshClass; public final JButton refreshClass;
public final Set<String> openedTabs = new HashSet<>(); public final Set<String> openedTabs = new HashSet<>();