Add background color to Containers
This commit is contained in:
@@ -36,6 +36,7 @@ import net.minecraft.crash.CrashReportCategory;
|
|||||||
import net.minecraft.util.ReportedException;
|
import net.minecraft.util.ReportedException;
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
import org.lwjgl.util.Point;
|
import org.lwjgl.util.Point;
|
||||||
|
import org.lwjgl.util.ReadableColor;
|
||||||
import org.lwjgl.util.ReadableDimension;
|
import org.lwjgl.util.ReadableDimension;
|
||||||
import org.lwjgl.util.ReadablePoint;
|
import org.lwjgl.util.ReadablePoint;
|
||||||
|
|
||||||
@@ -58,6 +59,8 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
|
|||||||
|
|
||||||
private Layout layout = DEFAULT_LAYOUT;
|
private Layout layout = DEFAULT_LAYOUT;
|
||||||
|
|
||||||
|
private ReadableColor backgroundColor;
|
||||||
|
|
||||||
public AbstractGuiContainer() {
|
public AbstractGuiContainer() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,6 +143,9 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
|
|||||||
});
|
});
|
||||||
throw new ReportedException(crashReport);
|
throw new ReportedException(crashReport);
|
||||||
}
|
}
|
||||||
|
if (backgroundColor != null) {
|
||||||
|
renderer.drawRect(0, 0, size.getWidth(), size.getHeight(), backgroundColor);
|
||||||
|
}
|
||||||
for (final Map.Entry<GuiElement, Pair<ReadablePoint, ReadableDimension>> e : layedOutElements.entrySet()) {
|
for (final Map.Entry<GuiElement, Pair<ReadablePoint, ReadableDimension>> e : layedOutElements.entrySet()) {
|
||||||
GuiElement element = e.getKey();
|
GuiElement element = e.getKey();
|
||||||
if (element instanceof ComposedGuiElement) {
|
if (element instanceof ComposedGuiElement) {
|
||||||
@@ -210,4 +216,15 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
|
|||||||
public ReadableDimension calcMinSize() {
|
public ReadableDimension calcMinSize() {
|
||||||
return layout.calcMinSize(this);
|
return layout.calcMinSize(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ReadableColor getBackgroundColor() {
|
||||||
|
return backgroundColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setBackgroundColor(ReadableColor backgroundColor) {
|
||||||
|
this.backgroundColor = backgroundColor;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import de.johni0702.minecraft.gui.element.GuiElement;
|
|||||||
import de.johni0702.minecraft.gui.layout.Layout;
|
import de.johni0702.minecraft.gui.layout.Layout;
|
||||||
import de.johni0702.minecraft.gui.layout.LayoutData;
|
import de.johni0702.minecraft.gui.layout.LayoutData;
|
||||||
import org.lwjgl.util.Point;
|
import org.lwjgl.util.Point;
|
||||||
|
import org.lwjgl.util.ReadableColor;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -41,4 +42,6 @@ public interface GuiContainer<T extends GuiContainer<T>> extends ComposedGuiElem
|
|||||||
T addElements(LayoutData layoutData, GuiElement...elements);
|
T addElements(LayoutData layoutData, GuiElement...elements);
|
||||||
T removeElement(GuiElement element);
|
T removeElement(GuiElement element);
|
||||||
|
|
||||||
|
ReadableColor getBackgroundColor();
|
||||||
|
T setBackgroundColor(ReadableColor backgroundColor);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user