Better looking tab close button.

GraxCode · GraxCode · commit fb4a15f0c3fb · 2022-04-17T15:04:39.000+02:00
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java
@@ -32,13 +32,15 @@
 /**
  * @author Konloch
  * @since 6/25/2021
+ * Using CloseButton of darklaf instead. 4/17/2022
  */
+@Deprecated
 public class TabExitButton extends JButton implements ActionListener
 {
 	private final TabbedPane tabbedPane;
 	private final int tabIndex;
 	private final String tabWorkingName;
-	
+
 	public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName)
 	{
 		this.tabbedPane = tabbedPane;
@@ -62,12 +64,12 @@ public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName)
 		// Close the proper tab by clicking the button
 		addActionListener(this);
 	}
-	
+
 	public int getTabIndex()
 	{
 		return tabIndex;
 	}
-	
+
 	@Override
 	public void actionPerformed(final ActionEvent e)
 	{
@@ -77,11 +79,11 @@ public void actionPerformed(final ActionEvent e)
 			tabbedPane.tabs.remove(i);
 		}
 	}
-	
+
 	// we don't want to update UI for this button
 	@Override
 	public void updateUI() { }
-	
+
 	// paint the cross
 	@Override
 	protected void paintComponent(final Graphics g)
@@ -91,33 +93,33 @@ protected void paintComponent(final Graphics g)
 		// shift the image for pressed buttons
 		if (getModel().isPressed())
 			g2.translate(1, 1);
-		
+
 		g2.setStroke(new BasicStroke(2));
 		g2.setColor(Color.BLACK);
-		
+
 		if (getModel().isRollover())
 			g2.setColor(Color.MAGENTA);
-		
+
 		final int delta = 6;
 		g2.drawLine(delta, delta, getWidth() - delta - 1, getHeight() - delta - 1);
 		g2.drawLine(getWidth() - delta - 1, delta, delta, getHeight() - delta - 1);
 		g2.dispose();
 	}
-	
+
 	public TabbedPane getTabbedPane()
 	{
 		return tabbedPane;
 	}
-	
+
 	public String getTabWorkingName()
 	{
 		return tabWorkingName;
 	}
-	
+
 	public static long getSerialVersionUID()
 	{
 		return serialVersionUID;
 	}
-	
+
 	private static final long serialVersionUID = -4492967978286454159L;
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java
@@ -4,7 +4,6 @@
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Rectangle;
-import java.awt.event.InputEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -16,6 +15,8 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
+
+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.MaxWidthJLabel;
@@ -84,7 +85,7 @@ public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName,
         // add more space between the label and the button
         label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
         // tab button
-        JButton exitButton = new TabExitButton(this, tabIndex, tabWorkingName);
+        JButton exitButton = new CloseButton();
         this.add(exitButton);
         // add more space to the top of the component
         setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
@@ -101,34 +102,24 @@ public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName,
         exitButton.setComponentPopupMenu(rightClickMenu);
         exitButton.addMouseListener(new MouseClickedListener(e ->
         {
-            if (e.getModifiersEx() != InputEvent.ALT_DOWN_MASK || System.currentTimeMillis() - lastMouseClick < 100)
-                return;
-    
-            lastMouseClick = System.currentTimeMillis();
-            final int i = existingTabs.indexOfTabComponent(TabbedPane.this);
-            if (i != -1)
-                existingTabs.remove(i);
+            if (this.getTabIndex() != -1)
+                existingTabs.remove(this.getTabIndex());
         }));
         
         closeTab.addActionListener(e ->
         {
-            TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker();
-            final int index = tabExitButton.getTabIndex();
-    
-            if (index != -1)
-                existingTabs.remove(index);
+            if (this.getTabIndex() != -1)
+                existingTabs.remove(this.getTabIndex());
         });
         closeAllTabs.addActionListener(e ->
         {
-            TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker();
-            final int index = tabExitButton.getTabIndex();
-            
+
             while (true)
             {
                 if (existingTabs.getTabCount() <= 1)
                     return;
                 
-                if (index != 0)
+                if (this.getTabIndex() != 0)
                     existingTabs.remove(0);
                 else
                     existingTabs.remove(1);
@@ -257,5 +248,8 @@ public void onMousePressed(MouseEvent e)
     }
     
     private static final long serialVersionUID = -4774885688297538774L;
-    
+
+    public int getTabIndex() {
+        return tabs.indexOfTabComponent(this);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@`
`32`	`32`	`/**`
`33`	`33`	`* @author Konloch`
`34`	`34`	`* @since 6/25/2021`
	`35`	`+ * Using CloseButton of darklaf instead. 4/17/2022`
`35`	`36`	`*/`
	`37`	`+@Deprecated`
`36`	`38`	`public class TabExitButton extends JButton implements ActionListener`
`37`	`39`	`{`
`38`	`40`	`private final TabbedPane tabbedPane;`
`39`	`41`	`private final int tabIndex;`
`40`	`42`	`private final String tabWorkingName;`
`41`		`-`
	`43`	`+`
`42`	`44`	`public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName)`
`43`	`45`	`{`
`44`	`46`	`this.tabbedPane = tabbedPane;`
`@@ -62,12 +64,12 @@ public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName)`
`62`	`64`	`// Close the proper tab by clicking the button`
`63`	`65`	`addActionListener(this);`
`64`	`66`	`}`
`65`		`-`
	`67`	`+`
`66`	`68`	`public int getTabIndex()`
`67`	`69`	`{`
`68`	`70`	`return tabIndex;`
`69`	`71`	`}`
`70`		`-`
	`72`	`+`
`71`	`73`	`@Override`
`72`	`74`	`public void actionPerformed(final ActionEvent e)`
`73`	`75`	`{`
`@@ -77,11 +79,11 @@ public void actionPerformed(final ActionEvent e)`
`77`	`79`	`tabbedPane.tabs.remove(i);`
`78`	`80`	`}`
`79`	`81`	`}`
`80`		`-`
	`82`	`+`
`81`	`83`	`// we don't want to update UI for this button`
`82`	`84`	`@Override`
`83`	`85`	`public void updateUI() { }`
`84`		`-`
	`86`	`+`
`85`	`87`	`// paint the cross`
`86`	`88`	`@Override`
`87`	`89`	`protected void paintComponent(final Graphics g)`
`@@ -91,33 +93,33 @@ protected void paintComponent(final Graphics g)`
`91`	`93`	`// shift the image for pressed buttons`
`92`	`94`	`if (getModel().isPressed())`
`93`	`95`	`g2.translate(1, 1);`
`94`		`-`
	`96`	`+`
`95`	`97`	`g2.setStroke(new BasicStroke(2));`
`96`	`98`	`g2.setColor(Color.BLACK);`
`97`		`-`
	`99`	`+`
`98`	`100`	`if (getModel().isRollover())`
`99`	`101`	`g2.setColor(Color.MAGENTA);`
`100`		`-`
	`102`	`+`
`101`	`103`	`final int delta = 6;`
`102`	`104`	`g2.drawLine(delta, delta, getWidth() - delta - 1, getHeight() - delta - 1);`
`103`	`105`	`g2.drawLine(getWidth() - delta - 1, delta, delta, getHeight() - delta - 1);`
`104`	`106`	`g2.dispose();`
`105`	`107`	`}`
`106`		`-`
	`108`	`+`
`107`	`109`	`public TabbedPane getTabbedPane()`
`108`	`110`	`{`
`109`	`111`	`return tabbedPane;`
`110`	`112`	`}`
`111`		`-`
	`113`	`+`
`112`	`114`	`public String getTabWorkingName()`
`113`	`115`	`{`
`114`	`116`	`return tabWorkingName;`
`115`	`117`	`}`
`116`		`-`
	`118`	`+`
`117`	`119`	`public static long getSerialVersionUID()`
`118`	`120`	`{`
`119`	`121`	`return serialVersionUID;`
`120`	`122`	`}`
`121`		`-`
	`123`	`+`
`122`	`124`	`private static final long serialVersionUID = -4492967978286454159L;`
`123`	`125`	`}`