From 491ab013f126a2a19c9e9cfb121e2f7fca67b58d Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sun, 8 Nov 2015 08:59:35 +0100 Subject: [PATCH] Fix scissor test being enabled while no area is set --- .../java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java | 7 +++++-- .../gui/element/advanced/AbstractGuiDropdownMenu.java | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java b/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java index 78329332..8a2fb03c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java +++ b/src/main/java/de/johni0702/minecraft/gui/OffsetGuiRenderer.java @@ -92,7 +92,10 @@ public class OffsetGuiRenderer implements GuiRenderer { @Override public void setDrawingArea(int x, int y, int width, int height) { - if (!strict) return; + if (!strict) { + renderer.setDrawingArea(x + position.getX(), y + position.getY(), width, height); + return; + } int x2 = x + width; int y2 = y + height; // Convert and clamp top and left border @@ -111,7 +114,7 @@ public class OffsetGuiRenderer implements GuiRenderer { public void startUsing() { GL11.glPushAttrib(GL11.GL_SCISSOR_BIT); GL11.glEnable(GL11.GL_SCISSOR_TEST); - setDrawingArea(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE); + setDrawingArea(0, 0, size.getWidth(), size.getHeight()); } public void stopUsing() { diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java b/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java index d36af178..21bd4931 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiDropdownMenu.java @@ -112,7 +112,12 @@ public abstract class AbstractGuiDropdownMenu