Skip to content

Commit 2044556

Browse files
committed
Update to latest commons swing
1 parent a8eb9cc commit 2044556

File tree

6 files changed

+14
-164
lines changed

6 files changed

+14
-164
lines changed

gui/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,11 @@ configurations {
99
api.extendsFrom include
1010
}
1111

12-
repositories {
13-
maven {
14-
name = "lenni0451"
15-
url = "https://maven.lenni0451.net/everything"
16-
}
17-
}
18-
1912
dependencies {
2013
include project(":")
2114

2215
include "com.formdev:flatlaf:3.4"
23-
include "net.lenni0451.commons:swing:1.5.0-SNAPSHOT"
16+
include "net.lenni0451.commons:swing:1.5.0"
2417
include "org.lwjgl:lwjgl:3.3.3"
2518
include "org.lwjgl:lwjgl-openal:3.3.3"
2619
["natives-windows", "natives-windows-arm64", "natives-linux", "natives-linux-arm64", "natives-macos", "natives-macos-arm64"].each {

gui/src/main/java/net/raphimc/noteblocktool/elements/InvisiblePanel.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

gui/src/main/java/net/raphimc/noteblocktool/elements/ScrollPaneSizedPanel.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

gui/src/main/java/net/raphimc/noteblocktool/elements/TextOverlayPanel.java

Lines changed: 11 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,67 +17,23 @@
1717
*/
1818
package net.raphimc.noteblocktool.elements;
1919

20-
import javax.swing.*;
21-
import java.awt.*;
22-
import java.awt.event.FocusAdapter;
23-
import java.awt.event.FocusEvent;
24-
import java.awt.event.KeyAdapter;
25-
import java.awt.event.MouseAdapter;
26-
27-
public class TextOverlayPanel extends JPanel {
20+
import net.lenni0451.commons.swing.components.OverlayPanel;
2821

29-
private static final MouseAdapter VOID_MOUSE_ADAPTER = new MouseAdapter() {
30-
};
31-
private static final KeyAdapter VOID_KEY_ADAPTER = new KeyAdapter() {
32-
};
33-
private static final FocusAdapter STEALING_FOCUS_ADAPTER = new FocusAdapter() {
34-
@Override
35-
public void focusLost(FocusEvent e) {
36-
e.getComponent().requestFocus();
37-
}
38-
};
22+
import java.awt.*;
3923

24+
public class TextOverlayPanel extends OverlayPanel {
4025

4126
private String text;
4227

4328
public TextOverlayPanel(final String text) {
29+
super(new Color(50, 50, 50, 150));
4430
this.text = text;
4531

4632
this.setOpaque(false);
4733
}
4834

49-
public void setText(final String text) {
50-
this.text = text;
51-
this.invalidate();
52-
this.repaint();
53-
}
54-
55-
@Override
56-
public void addNotify() {
57-
super.addNotify();
58-
59-
this.addMouseListener(VOID_MOUSE_ADAPTER);
60-
this.addMouseMotionListener(VOID_MOUSE_ADAPTER);
61-
this.addMouseWheelListener(VOID_MOUSE_ADAPTER);
62-
this.addKeyListener(VOID_KEY_ADAPTER);
63-
this.addFocusListener(STEALING_FOCUS_ADAPTER);
64-
}
65-
66-
@Override
67-
public void removeNotify() {
68-
super.removeNotify();
69-
70-
this.removeMouseListener(VOID_MOUSE_ADAPTER);
71-
this.removeMouseMotionListener(VOID_MOUSE_ADAPTER);
72-
this.removeMouseWheelListener(VOID_MOUSE_ADAPTER);
73-
this.removeKeyListener(VOID_KEY_ADAPTER);
74-
this.removeFocusListener(STEALING_FOCUS_ADAPTER);
75-
}
76-
7735
@Override
78-
protected void paintComponent(Graphics g) {
79-
g.setColor(new Color(50, 50, 50, 150));
80-
g.fillRect(0, 0, this.getWidth(), this.getHeight());
36+
protected void paintOverlay(Graphics g) {
8137
g.setColor(Color.WHITE);
8238
final FontMetrics metrics = g.getFontMetrics();
8339
final String[] lines = this.text.split("\n");
@@ -89,7 +45,12 @@ protected void paintComponent(Graphics g) {
8945
g.drawString(line, x, y);
9046
y += metrics.getHeight();
9147
}
92-
super.paintComponent(g);
48+
}
49+
50+
public void setText(final String text) {
51+
this.text = text;
52+
this.invalidate();
53+
this.repaint();
9354
}
9455

9556
}

gui/src/main/java/net/raphimc/noteblocktool/frames/edittabs/EditTab.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
*/
1818
package net.raphimc.noteblocktool.frames.edittabs;
1919

20+
import net.lenni0451.commons.swing.components.ScrollPaneSizedPanel;
2021
import net.lenni0451.commons.swing.layouts.VerticalLayout;
2122
import net.raphimc.noteblocklib.model.Song;
2223
import net.raphimc.noteblocklib.model.SongView;
2324
import net.raphimc.noteblocktool.elements.FastScrollPane;
24-
import net.raphimc.noteblocktool.elements.ScrollPaneSizedPanel;
2525
import net.raphimc.noteblocktool.frames.ListFrame;
2626

2727
import javax.swing.*;

gui/src/main/java/net/raphimc/noteblocktool/frames/edittabs/MetadataTab.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
package net.raphimc.noteblocktool.frames.edittabs;
1919

2020
import net.lenni0451.commons.swing.GBC;
21+
import net.lenni0451.commons.swing.components.InvisiblePanel;
2122
import net.raphimc.noteblocklib.format.mcsp.McSpSong;
2223
import net.raphimc.noteblocklib.format.mcsp.model.McSpHeader;
2324
import net.raphimc.noteblocklib.format.nbs.NbsSong;
2425
import net.raphimc.noteblocklib.format.nbs.model.NbsHeader;
2526
import net.raphimc.noteblocklib.model.Song;
2627
import net.raphimc.noteblocklib.model.SongView;
27-
import net.raphimc.noteblocktool.elements.InvisiblePanel;
2828
import net.raphimc.noteblocktool.frames.ListFrame;
2929

3030
import javax.swing.*;

0 commit comments

Comments
 (0)