Add background toggle option to button and text (box) element

mchorse · mchorse · commit 4dcb25919f7b · 2021-08-17T12:52:09.000+01:00
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiButtonElement.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiButtonElement.java
@@ -19,6 +19,7 @@ public class GuiButtonElement extends GuiClickElement<GuiButtonElement> implemen
 
     public boolean custom;
     public int customColor;
+    public boolean background = true;
 
     public GuiButtonElement(Minecraft mc, IKey label, Consumer<GuiButtonElement> callback)
     {
@@ -44,6 +45,13 @@ public GuiButtonElement textColor(int color, boolean shadow)
         return this;
     }
 
+    public GuiButtonElement background(boolean background)
+    {
+        this.background = background;
+
+        return this;
+    }
+
     @Override
     public void setColor(int color, boolean shadow)
     {
@@ -67,7 +75,10 @@ protected void drawSkin(GuiContext context)
             color = ColorUtils.multiplyColor(color, 0.85F);
         }
 
-        GuiDraw.drawBorder(this.area, color);
+        if (this.background)
+        {
+            GuiDraw.drawBorder(this.area, color);
+        }
 
         String label = this.label.get();
         int x = this.area.mx(this.font.getStringWidth(label));
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/input/GuiTextElement.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/input/GuiTextElement.java
@@ -73,6 +73,14 @@ public GuiTextElement validator(Predicate<String> validator)
         return this;
     }
 
+    public GuiTextElement background(boolean background)
+    {
+        this.field.setEnableBackgroundDrawing(background);
+        this.resize();
+
+        return this;
+    }
+
     public void setText(String text)
     {
         if (text == null)
@@ -116,6 +124,14 @@ public void resize()
         this.field.y = this.area.y + 1;
         this.field.width = this.area.w - 2;
         this.field.height = this.area.h - 2;
+
+        if (!this.field.getEnableBackgroundDrawing())
+        {
+            this.field.x += 4;
+            this.field.y += ((this.area.h - this.font.FONT_HEIGHT) / 2);
+            this.field.width -= 8;
+            this.field.height = this.font.FONT_HEIGHT;
+        }
     }
 
     @Override
diff --git a/src/main/java/mchorse/mclib/client/gui/mclib/GuiDebugPanel.java b/src/main/java/mchorse/mclib/client/gui/mclib/GuiDebugPanel.java
@@ -1,123 +1,37 @@
 package mchorse.mclib.client.gui.mclib;
 
-import mchorse.mclib.client.gui.framework.elements.GuiElement;
-import mchorse.mclib.client.gui.framework.elements.GuiModelRenderer;
 import mchorse.mclib.client.gui.framework.elements.buttons.GuiButtonElement;
 import mchorse.mclib.client.gui.framework.elements.buttons.GuiSlotElement;
 import mchorse.mclib.client.gui.framework.elements.context.GuiSimpleContextMenu;
-import mchorse.mclib.client.gui.framework.elements.input.GuiTransformations;
-import mchorse.mclib.client.gui.framework.elements.keyframes.GuiDopeSheet;
-import mchorse.mclib.client.gui.framework.elements.keyframes.GuiGraphView;
-import mchorse.mclib.client.gui.framework.elements.keyframes.GuiKeyframesEditor;
-import mchorse.mclib.client.gui.framework.elements.keyframes.GuiSheet;
+import mchorse.mclib.client.gui.framework.elements.input.GuiTextElement;
 import mchorse.mclib.client.gui.framework.elements.utils.GuiContext;
 import mchorse.mclib.client.gui.utils.Icons;
 import mchorse.mclib.client.gui.utils.keys.IKey;
-import mchorse.mclib.utils.Color;
-import mchorse.mclib.utils.ColorUtils;
-import mchorse.mclib.utils.keyframes.Keyframe;
-import mchorse.mclib.utils.keyframes.KeyframeChannel;
-import mchorse.mclib.utils.keyframes.KeyframeInterpolation;
-import mchorse.mclib.utils.wav.Wave;
-import mchorse.mclib.utils.wav.WavePlayer;
-import mchorse.mclib.utils.wav.WaveReader;
-import mchorse.mclib.utils.wav.Waveform;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class GuiDebugPanel extends GuiDashboardPanel<GuiAbstractDashboard>
 {
-    public GuiKeyframesEditor<GuiDopeSheet> dopesheet;
-    public GuiKeyframesEditor<GuiGraphView> graph;
-    public GuiModelRenderer renderer;
     public GuiButtonElement play;
     public GuiSlotElement slot;
-
-    public GuiTransformations top;
-    public GuiTransformations bottom;
-
-    private WavePlayer player;
-    private Waveform wave;
-
-    public GuiElement element;
+    public GuiTextElement text;
 
     public GuiDebugPanel(Minecraft mc, GuiAbstractDashboard dashboard)
     {
         super(mc, dashboard);
 
-        this.dopesheet = new GuiKeyframesEditor<GuiDopeSheet>(mc)
-        {
-            @Override
-            protected GuiDopeSheet createElement(Minecraft mc)
-            {
-                return new GuiDopeSheet(mc, this::fillData);
-            }
-        };
-
-        this.graph = new GuiKeyframesEditor<GuiGraphView>(mc)
-        {
-            @Override
-            protected GuiGraphView createElement(Minecraft mc)
-            {
-                return new GuiGraphView(mc, this::fillData);
-            }
-        };
-
         this.slot = new GuiSlotElement(mc, 0, (t) -> {});
         this.slot.flex().relative(this).x(0.5F).y(20).anchorX(0.5F);
         this.slot.setStack(new ItemStack(Items.BAKED_POTATO, 42));
 
-        KeyframeChannel channel = new KeyframeChannel();
-
-        channel.insert(0, 10);
-        Keyframe a = channel.get(channel.insert(20, 10));
-        channel.get(channel.insert(80, 0));
-        channel.get(channel.insert(100, 0));
-
-        a.interp = KeyframeInterpolation.BEZIER;
-
-        for (int i = 0; i < 5; i++)
-        {
-            KeyframeChannel c = new KeyframeChannel();
-
-            c.copy(channel);
-
-            this.dopesheet.graph.sheets.add(new GuiSheet("" + i, IKey.str("Test " + i), new Color((float) Math.random(), (float) Math.random(), (float) Math.random()).getRGBColor(), c));
-        }
-
-        this.dopesheet.graph.duration = 100;
-        this.graph.graph.setChannel(channel, 0x0088ff);
-        this.graph.graph.duration = 100;
-
-        this.dopesheet.flex().relative(this).y(0).wh(1F, 0.5F);
-        this.graph.flex().relative(this).y(0.5F).wh(1F, 0.5F);
-
-        this.renderer = new GuiModelRenderer(mc)
-        {
-            @Override
-            protected void drawUserModel(GuiContext context)
-            {}
-        };
-        this.play = new GuiButtonElement(mc, IKey.str("Play me!"), this::play);
-
-        this.top = new GuiTransformations(mc);
-        this.top.fillR(90, 0, -90);
-        this.top.fillT(1, 5, -2);
-        this.bottom = new GuiTransformations(mc);
-        this.bottom.fillT(0, -2, 1.5);
-        this.bottom.fillS(2, 2, 2);
-        this.bottom.fillR(0, 180, 0);
+        this.play = new GuiButtonElement(mc, IKey.str("Play me!"), null).background(false);
+        this.play.flex().relative(this).xy(10, 10).w(80);
 
-        this.top.flex().relative(this).x(0.5F).y(10).wh(190, 70).anchor(0.5F, 0);
-        this.bottom.flex().relative(this).x(0.5F).y(1F, -10).wh(190, 70).anchor(0.5F, 1F);
+        this.text = new GuiTextElement(mc, 1000, null).background(false);
+        this.text.flex().relative(this).xy(10, 40).w(80);
 
-        this.renderer.flex().relative(this).wh(1F, 1F);
-        this.play.flex().relative(this).xy(10, 10).w(80);
-        this.add(/* this.renderer, this.play, */this.slot);
-        // this.add(this.graph, this.dopesheet);
-        // this.add(this.top, this.bottom);
+        this.add(this.slot, this.play, this.text);
 
         this.context(() ->
         {
@@ -130,34 +44,6 @@ protected void drawUserModel(GuiContext context)
 
             return contextMenu;
         });
-
-        this.element = new GuiElement(mc);
-        this.element.flex().relative(this).wh(0.33F, 0.33F).row(5).resize().width(80).padding(10);
-
-        for (int i = 0; i < 5; i ++)
-        {
-            GuiButtonElement buttonElement = new GuiButtonElement(mc, IKey.str(String.valueOf(i)), null);
-
-            buttonElement.flex().h(20);
-
-            if (i == 1)
-            {
-                buttonElement.marginLeft(0);
-                buttonElement.marginRight(30);
-            }
-            else if (i == 2)
-            {
-                buttonElement.marginTop(50);
-            }
-            else if (i == 3)
-            {
-                buttonElement.marginBottom(50);
-            }
-
-            this.element.add(buttonElement);
-        }
-
-        // this.add(this.element);
     }
 
     @Override
@@ -166,78 +52,17 @@ public boolean isClientSideOnly()
         return true;
     }
 
-    private void play(GuiButtonElement button)
-    {
-        try
-        {
-            if (this.player != null)
-            {
-                this.player.delete();
-            }
-
-            if (this.wave != null)
-            {
-                this.wave.delete();
-            }
-
-            WaveReader reader = new WaveReader();
-            Wave data = reader.read(this.getClass().getResourceAsStream("/assets/mclib/8.wav"));
-
-            if (data.getBytesPerSample() > 2)
-            {
-                data = data.convertTo16();
-            }
-
-            this.player = new WavePlayer().initialize(data);
-            this.player.play();
-
-            this.wave = new Waveform();
-            this.wave.generate(data, 20, 150);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     public void resize()
     {
         super.resize();
-
-        this.dopesheet.graph.resetView();
-        this.graph.graph.resetView();
     }
 
     @Override
     public void draw(GuiContext context)
     {
-        this.element.area.draw(ColorUtils.HALF_BLACK);
-
-        if (this.player != null && !this.player.isPlaying())
-        {
-            this.player.delete();
-            this.player = null;
-        }
-
         super.draw(context);
 
-        if (this.wave != null)
-        {
-            int w = this.wave.getWidth();
-            int h = this.wave.getHeight();
-
-            GlStateManager.enableTexture2D();
-
-            GlStateManager.color(0, 0, 0, 1);
-            this.wave.draw(this.area.x + 10, this.area.my() - h / 2 - 2, 0, 0, w, h);
-
-            GlStateManager.color(0.25F, 0.25F, 0.25F, 1);
-            this.wave.draw(this.area.x + 10, this.area.my() - h / 2, 0, 0, 200, h);
-            GlStateManager.color(0.5F, 0.5F, 0.5F, 1);
-            this.wave.draw(this.area.x + 10 + 200, this.area.my() - h / 2, 200, 0, 200, h);
-            GlStateManager.color(1, 1, 1, 1);
-            this.wave.draw(this.area.x + 10 + 400, this.area.my() - h / 2, 400, 0, w, h);
-        }
+        this.text.background(System.currentTimeMillis() % 2000 < 1000);
     }
 }
