From de322e4b6e54caf574c404d64831c4f809496722 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sun, 11 Oct 2015 10:37:40 +0200 Subject: [PATCH] Add background color to Containers --- .../gui/container/AbstractGuiContainer.java | 17 +++++++++++++++++ .../minecraft/gui/container/GuiContainer.java | 3 +++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java index 1bfbef0a..20afabaf 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java +++ b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java @@ -36,6 +36,7 @@ import net.minecraft.crash.CrashReportCategory; import net.minecraft.util.ReportedException; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.util.Point; +import org.lwjgl.util.ReadableColor; import org.lwjgl.util.ReadableDimension; import org.lwjgl.util.ReadablePoint; @@ -58,6 +59,8 @@ public abstract class AbstractGuiContainer> private Layout layout = DEFAULT_LAYOUT; + private ReadableColor backgroundColor; + public AbstractGuiContainer() { } @@ -140,6 +143,9 @@ public abstract class AbstractGuiContainer> }); throw new ReportedException(crashReport); } + if (backgroundColor != null) { + renderer.drawRect(0, 0, size.getWidth(), size.getHeight(), backgroundColor); + } for (final Map.Entry> e : layedOutElements.entrySet()) { GuiElement element = e.getKey(); if (element instanceof ComposedGuiElement) { @@ -210,4 +216,15 @@ public abstract class AbstractGuiContainer> public ReadableDimension calcMinSize() { return layout.calcMinSize(this); } + + @Override + public ReadableColor getBackgroundColor() { + return backgroundColor; + } + + @Override + public T setBackgroundColor(ReadableColor backgroundColor) { + this.backgroundColor = backgroundColor; + return getThis(); + } } diff --git a/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java b/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java index bfd846ec..afc442da 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java +++ b/src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java @@ -27,6 +27,7 @@ import de.johni0702.minecraft.gui.element.GuiElement; import de.johni0702.minecraft.gui.layout.Layout; import de.johni0702.minecraft.gui.layout.LayoutData; import org.lwjgl.util.Point; +import org.lwjgl.util.ReadableColor; import java.util.Map; @@ -41,4 +42,6 @@ public interface GuiContainer> extends ComposedGuiElem T addElements(LayoutData layoutData, GuiElement...elements); T removeElement(GuiElement element); + ReadableColor getBackgroundColor(); + T setBackgroundColor(ReadableColor backgroundColor); }