From 88dece679d6ee3f2feb93e4ba9fdf554b90daa8a Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 15 Aug 2021 17:25:23 +0200 Subject: [PATCH] Fix scissor state not including scissor bounds (fixes #556) This caused the bounds to not be relaxed after e.g. lists and as such the scroll bar and shadows would not render properly. --- jGui | 2 +- .../com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jGui b/jGui index 391aadaf..31bcfabe 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 391aadafbf2f463ebad06815024266e17649012f +Subproject commit 31bcfabe67a5b2de490e0f5c53c1a59e636497be diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java b/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java index 3576ffa0..da17ba14 100644 --- a/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java +++ b/src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java @@ -34,7 +34,7 @@ import java.util.Optional; import static com.replaymod.core.versions.MCVer.emitLine; import static de.johni0702.minecraft.gui.versions.MCVer.popScissorState; import static de.johni0702.minecraft.gui.versions.MCVer.pushScissorState; -import static de.johni0702.minecraft.gui.versions.MCVer.setScissorState; +import static de.johni0702.minecraft.gui.versions.MCVer.setScissorDisabled; //#if MC>=11700 //$$ import com.mojang.blaze3d.systems.RenderSystem; @@ -176,7 +176,7 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline