V1.1.1a

realPaulsen · realPaulsen · commit a566ee2d4454 · 2021-11-14T18:28:51.000+01:00
New:
- NEW PUICanvas is inherited by every Element and is responsible for the rendering; Can also be added alone to the PUIFrame as a layer to be used as a Non-Interactive-Drawingspace
- PUIScrollList
  + can now have spaces between Elements
  + can now center an Element in the list
diff --git a/src/com/paulsen/demo/Main.java b/src/com/paulsen/demo/Main.java
@@ -3,13 +3,26 @@
 import com.paulsen.ui.*;
 import com.paulsen.ui.PUIElement.ElementAlignment;
 
+import java.awt.*;
+
 public class Main {
 
     public Main() {
 
         // initialize variables before using them in update/paint
         PUIFrame f = new PUIFrame("Project-Library Demo", 600, 600);
 
+
+        // Drawing a rectangle in the background
+        PUICanvas canvas = new PUICanvas(f, new PUIPaintable() {
+            @Override
+            public void paint(Graphics g, int x, int y, int w, int h) {
+                g.setColor(new Color(100, 100, 100));
+                g.fillRoundRect(40, 40, w - 80, h - 80, 20, 20);
+            }
+        }, -1);
+
+
         PUIText darkmodeButton = new PUIText(f, "LIGHT", 2);
         darkmodeButton.addActionListener(new PUIAction() {
             @Override
@@ -55,7 +68,7 @@ public void run() {
         slider2.addValueUpdateAction(new Runnable() {
             @Override
             public void run() {
-                rc.setValueThickness((int) (67* slider2.getValue()));
+                rc.setValueThickness((int) (67 * slider2.getValue()));
             }
         });
 
@@ -66,10 +79,15 @@ public void run() {
                 @Override
                 public void run(PUIElement that) {
                     f.setTitle(((PUIText) that).getText());
+
+                    // automatically centers clicked Element in the UI
+                    sp.center(that);
                 }
             });
             sp.addElement(t);
         }
+        // comment out if the size of the element inside of the panel should be further limited
+//        sp.setElementSpacing(6,0,3,3);
 
         // prevent different colors when hovering/pressing
         for (PUIElement e : PUIElement.registeredElements) {
diff --git a/src/com/paulsen/ui/PUICanvas.java b/src/com/paulsen/ui/PUICanvas.java
@@ -0,0 +1,65 @@
+package com.paulsen.ui;
+
+import java.awt.*;
+
+public class PUICanvas {
+
+    protected PUIFrame frame;
+    protected PUIPaintable paint;
+
+    protected boolean visible = true/*, blockRaycast = false*/;
+
+    // other
+    protected int drawLayer = 0;
+
+    public PUICanvas(PUIFrame f, PUIPaintable paint) {
+        frame = f;
+        this.paint = paint;
+        init();
+    }
+
+    public PUICanvas(PUIFrame f, PUIPaintable paint, int layer) {
+        frame = f;
+        this.paint = paint;
+        drawLayer = layer;
+        init();
+    }
+
+    private void init() {
+        if (frame != null)
+            frame.add(this);
+    }
+
+    public synchronized void draw(Graphics g) {
+        if (g != null && frame != null)
+            paint.paint(g, 0, 0, frame.w(), frame.h());
+    }
+
+    public PUIFrame getFrame() {
+        return frame;
+    }
+
+    public PUIPaintable getDraw() {
+        return paint;
+    }
+
+    public void setDraw(PUIPaintable paintable) {
+        this.paint = paintable;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+    }
+
+    public int getDrawLayer() {
+        return drawLayer;
+    }
+
+    public void setDrawLayer(int drawLayer) {
+        this.drawLayer = drawLayer;
+    }
+}
diff --git a/src/com/paulsen/ui/PUICore.java b/src/com/paulsen/ui/PUICore.java
@@ -48,8 +48,6 @@ public void mousePressed(MouseEvent e) {
                     if ((firstHitLayer == -1 || firstHitLayer == elem.getInteractionLayer()) && elem.contains(e.getPoint())) {
                         if (elem.blocksRaycast()) {
                             firstHitLayer = elem.getInteractionLayer();
-                        }else{
-                            System.out.println("let through");
                         }
                         for (MouseListener listener : elem.getMouseListeners())
                             listener.mousePressed(e);
diff --git a/src/com/paulsen/ui/PUIElement.java b/src/com/paulsen/ui/PUIElement.java
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class PUIElement { // PaulsenUserInterfaceIntegratedElement
+public class PUIElement extends PUICanvas { // PaulsenUserInterfaceIntegratedElement
 
     // Static
     public static volatile CopyOnWriteArrayList<PUIElement> registeredElements = new CopyOnWriteArrayList<PUIElement>();
@@ -22,7 +22,7 @@ public class PUIElement { // PaulsenUserInterfaceIntegratedElement
 
     protected int x = 0, y = 0, w = 0, h = 0;
     protected Color backgroundColor = Color.LIGHT_GRAY;
-    protected PUIPaintable paintInvoke, hoverOverlay, pressOverlay;
+    protected PUIPaintable hoverOverlay, pressOverlay;
     protected PUIFrame frame;
     protected PUICore core;
     protected ArrayList<PUIAction> actions = new ArrayList<>();
@@ -32,20 +32,21 @@ public class PUIElement { // PaulsenUserInterfaceIntegratedElement
     protected Object metaData;
     protected boolean updateFrameOnEvent = true, paintOverOnHover = true, paintOverOnPress = true, enabled = true;
     protected boolean blockRaycast = true;
-    private int drawLayer = 0;
     private int interactionLayer = 0;
     // TEMP-vars
     // pressed -> is pressed on Screen
     // isCurrentlyPressing -> is pressing on Element
     private boolean hovered = false, pressed = false, isCurrentlyPressing = false;
 
     public PUIElement(PUIFrame f) {
+        super(f, null);
         this.frame = f;
         init();
         initCore();
     }
 
     public PUIElement(PUIFrame f, int layer) {
+        super(f, null, layer);
         this.frame = f;
         init();
         initCore();
@@ -105,7 +106,7 @@ public void mouseClicked(MouseEvent e) {
             }
         });
 
-        paintInvoke = new PUIPaintable() {
+        paint = new PUIPaintable() {
             @Override
             public void paint(Graphics g, int x, int y, int w, int h) {
                 if (darkUIMode && backgroundColor == Color.LIGHT_GRAY) {
@@ -135,8 +136,6 @@ public void paint(Graphics g, int x, int y, int w, int h) {
                 g.fillRect(x, y, w, h);
             }
         };
-        if (frame != null)
-            frame.add(this);
     }
 
     private void initCore() {
@@ -161,6 +160,7 @@ private void initCore() {
         }
     }
 
+    @Override
     public synchronized void draw(Graphics g) {
         if (g == null)
             return;
@@ -171,8 +171,8 @@ public synchronized void draw(Graphics g) {
         } else
             hovered = false;
 
-        if (paintInvoke != null) {
-            paintInvoke.paint(g, x, y, w, h);
+        if (paint != null) {
+            paint.paint(g, x, y, w, h);
         }
         if (hovered) {
             if (hovered && !pressed && paintOverOnHover) {
@@ -258,10 +258,6 @@ public int getH() {
         return h;
     }
 
-    public void setDraw(PUIPaintable paintInvoke) {
-        this.paintInvoke = paintInvoke;
-    }
-
     public void setHoverOverlay(PUIPaintable paintInvoke) {
         hoverOverlay = paintInvoke;
     }
@@ -319,17 +315,13 @@ public boolean blocksRaycast() {
     }
 
     /**
-     *
      * @param doesBlockRaycast if set to false: when pressed => the eventchain doesnt stop => elements on layers behind this Button can be triggered as well
      */
     public void setRaycastable(boolean doesBlockRaycast) {
         this.blockRaycast = doesBlockRaycast;
     }
 
-    public int getDrawLayer() {
-        return drawLayer;
-    }
-
+    @Override
     public void setDrawLayer(int drawLayer) {
         this.drawLayer = drawLayer;
         frame.rearrangeElements();
diff --git a/src/com/paulsen/ui/PUIFrame.java b/src/com/paulsen/ui/PUIFrame.java
@@ -13,7 +13,7 @@ public class PUIFrame extends JFrame {
     private int maxFrameRate = 30;
 
     // registered Elements for managing drawing elements
-    private volatile ArrayList<PUIElement> elements = new ArrayList<>();
+    private volatile ArrayList<PUICanvas> elements = new ArrayList<>();
 
     private volatile PUIUpdatable updateElements;
     private volatile PUIPaintable paint; // called by canvas
@@ -22,8 +22,9 @@ public class PUIFrame extends JFrame {
     private int w = 100, h = 100;
     private String displayName = "PUIFrame"; // only for init
     private boolean hasInit = false, continuousDraw = false;
+    private int minUpdateDelay = 0;
 
-    public PUIFrame(PUIInitializable puiInitializable) {
+    public PUIFrame() {
         super();
         constructorInit();
     }
@@ -79,10 +80,12 @@ protected void paintComponent(Graphics g) {
                     paint.paint(g, 0, 0, w, h);
 
                 // Prevent Concurrent-Modification-Errors
-                ArrayList<PUIElement> tempEl = new ArrayList<>(elements);
+                ArrayList<PUICanvas> tempEl = new ArrayList<>(elements);
                 // Paints Elements
-                for (PUIElement el : tempEl) {
-                    if (el != null)
+                for (PUICanvas el : tempEl) {
+                    if (!(el instanceof PUIElement))
+                        g.setColor(Color.black);
+                    if (el != null && el.isVisible())
                         el.draw(g);
                 }
             }
@@ -91,8 +94,6 @@ protected void paintComponent(Graphics g) {
         add(canvas);
     }
 
-    private int minUpdateDelay = 0;
-
     private void initTimer() {
         new Thread(new Runnable() {
             @Override
@@ -161,7 +162,7 @@ public boolean hasInit() {
         return hasInit;
     }
 
-    public synchronized void add(PUIElement element) {
+    public synchronized void add(PUICanvas element) {
         if (element != null && !elements.contains(element)) {
             elements.add(element);
             rearrangeElements();
@@ -248,9 +249,9 @@ public void setContinuousDraw(boolean continuousUpdate) {
      * sets Draw-Order
      */
     public void rearrangeElements() {
-        Comparator<PUIElement> comp = new Comparator<PUIElement>() {
+        Comparator<PUICanvas> comp = new Comparator<PUICanvas>() {
             @Override
-            public int compare(PUIElement o1, PUIElement o2) {
+            public int compare(PUICanvas o1, PUICanvas o2) {
                 if (o1.getDrawLayer() < o2.getDrawLayer())
                     return -1;
                 if (o1.getDrawLayer() > o2.getDrawLayer())
diff --git a/src/com/paulsen/ui/PUIInitializable.java b/src/com/paulsen/ui/PUIInitializable.java
diff --git a/src/com/paulsen/ui/PUIRotaryControl.java b/src/com/paulsen/ui/PUIRotaryControl.java
@@ -36,7 +36,7 @@ public PUIRotaryControl(PUIFrame f, int layer) {
     }
 
     private void init() {
-        paintInvoke = new PUIPaintable() {
+        paint = new PUIPaintable() {
             @Override
             public void paint(Graphics g, int x, int y, int w, int h) {
                 if (w < 0)
diff --git a/src/com/paulsen/ui/PUIScrollPanel.java b/src/com/paulsen/ui/PUIScrollPanel.java

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,6 @@ public void mousePressed(MouseEvent e) {`
`48`	`48`	`if ((firstHitLayer == -1 \|\| firstHitLayer == elem.getInteractionLayer()) && elem.contains(e.getPoint())) {`
`49`	`49`	`if (elem.blocksRaycast()) {`
`50`	`50`	`firstHitLayer = elem.getInteractionLayer();`
`51`		`- }else{`
`52`		`- System.out.println("let through");`
`53`	`51`	`}`
`54`	`52`	`for (MouseListener listener : elem.getMouseListeners())`
`55`	`53`	`listener.mousePressed(e);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public PUIRotaryControl(PUIFrame f, int layer) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`private void init() {`
`39`		`- paintInvoke = new PUIPaintable() {`
	`39`	`+ paint = new PUIPaintable() {`
`40`	`40`	`@Override`
`41`	`41`	`public void paint(Graphics g, int x, int y, int w, int h) {`
`42`	`42`	`if (w < 0)`