diff --git a/pkg/src/com/jackmeng/prismix/jm_Prismix.java b/pkg/src/com/jackmeng/prismix/jm_Prismix.java index dc51af4..f5b1abe 100644 --- a/pkg/src/com/jackmeng/prismix/jm_Prismix.java +++ b/pkg/src/com/jackmeng/prismix/jm_Prismix.java @@ -2,7 +2,6 @@ package com.jackmeng.prismix; -import java.lang.management.ManagementFactory; import java.util.HashMap; import java.util.Map; import java.util.TimerTask; @@ -46,7 +45,7 @@ public class jm_Prismix } } - public static void main(String... args) // !! fuck pre Java 11 users, fuck their dumb shit + public static void main(String... x) // !! fuck pre Java 11 users, fuck their dumb shit { _1const.add(ux.ux, 10L); stl_Wrap< stl_In > reader = new stl_Wrap<>(new stl_In(System.in)); diff --git a/pkg/src/com/jackmeng/prismix/ux/gui_Container.java b/pkg/src/com/jackmeng/prismix/ux/gui_Container.java index dd2bc52..7bf0c22 100644 --- a/pkg/src/com/jackmeng/prismix/ux/gui_Container.java +++ b/pkg/src/com/jackmeng/prismix/ux/gui_Container.java @@ -2,13 +2,9 @@ package com.jackmeng.prismix.ux; -import javax.management.MXBean; -import javax.management.RuntimeMBeanException; import javax.swing.*; import com.jackmeng.prismix._1const; -import com.jackmeng.prismix.jm_Prismix; -import com.jackmeng.prismix.use_Maker; import com.jackmeng.prismix.stl.extend_stl_Colors; import com.jackmeng.stl.stl_Colors; import com.jackmeng.stl.stl_Function; @@ -18,8 +14,6 @@ import static com.jackmeng.prismix._1const.*; import java.awt.*; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; /** * Represents the inner shell of the content of the GUI. The parent is the ux diff --git a/pkg/src/com/jackmeng/prismix/ux/ui_ColorPicker.java b/pkg/src/com/jackmeng/prismix/ux/ui_ColorPicker.java index da870fa..46992d6 100644 --- a/pkg/src/com/jackmeng/prismix/ux/ui_ColorPicker.java +++ b/pkg/src/com/jackmeng/prismix/ux/ui_ColorPicker.java @@ -5,7 +5,6 @@ import com.jackmeng.prismix._1const; import com.jackmeng.prismix.use_Maker; import com.jackmeng.prismix.stl.extend_stl_Colors; -import com.jackmeng.stl.stl_Callback; import com.jackmeng.stl.stl_Listener; import com.jackmeng.stl.stl_Struct; import com.jackmeng.stl.stl_Struct.struct_Pair; @@ -40,6 +39,7 @@ public static final class CPick_GenericDisp public CPick_GenericDisp() { setFocusable(true); + setBorder(new ui_RoundBorder(10)); } @Override public void paintComponent(Graphics g) diff --git a/pkg/src/com/jackmeng/prismix/ux/ui_RoundBorder.java b/pkg/src/com/jackmeng/prismix/ux/ui_RoundBorder.java new file mode 100644 index 0000000..ddeb33e --- /dev/null +++ b/pkg/src/com/jackmeng/prismix/ux/ui_RoundBorder.java @@ -0,0 +1,31 @@ +// Software created by Jack Meng (AKA exoad). Licensed by the included "LICENSE" file. If this file is not found, the project is fully copyrighted. + +package com.jackmeng.prismix.ux; + +import javax.swing.border.Border; +import java.awt.*; + +public class ui_RoundBorder implements Border +{ + private int radius; + + ui_RoundBorder(int radius) + { + this.radius = radius; + } + + @Override public Insets getBorderInsets(Component c) + { + return new Insets(this.radius + 1, this.radius + 1, this.radius + 2, this.radius); + } + + @Override public boolean isBorderOpaque() + { + return true; + } + + @Override public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) + { + g.drawRoundRect(x, y, width - 1, height - 1, radius, radius); + } +} \ No newline at end of file diff --git a/pkg/src/com/jackmeng/prismix/ux/ux.java b/pkg/src/com/jackmeng/prismix/ux/ux.java index d64a53d..64eb642 100644 --- a/pkg/src/com/jackmeng/prismix/ux/ux.java +++ b/pkg/src/com/jackmeng/prismix/ux/ux.java @@ -12,11 +12,6 @@ import java.awt.event.AWTEventListener; import java.util.Arrays; import java.util.TimerTask; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionService; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference;