From 7094a18106f717a175200e8338cb099e8bd40a8b Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Fri, 17 Jul 2015 12:15:35 +0200 Subject: [PATCH] Close Toolbar in GuiReplayOverlay when GuiMouseInput is closed --- .../crushedpixel/replaymod/gui/GuiMouseInput.java | 5 +++++ .../replaymod/gui/overlay/GuiReplayOverlay.java | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiMouseInput.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiMouseInput.java index 1543035f..a70fa527 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiMouseInput.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiMouseInput.java @@ -38,4 +38,9 @@ public class GuiMouseInput extends GuiScreen { super.keyTyped(typedChar, keyCode); } + + @Override + public void onGuiClosed() { + ReplayMod.overlay.closeToolbar(); + } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java index 81b6bae0..c1ec53d3 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java @@ -258,12 +258,12 @@ public class GuiReplayOverlay extends Gui { private final GuiReplaySpeedSlider speedSlider = new GuiReplaySpeedSlider(1, SPEED_X, TOP_ROW, I18n.format("replaymod.gui.speed")); + private boolean toolbarOpen = false; + private final DelegatingElement toolbar = new DelegatingElement() { - private boolean open = false; - private void toggleOpen() { - open = !open; + toolbarOpen = !toolbarOpen; } private GuiElement buttonOpenToolbar = new GuiArrowButton(-1, 10, HEIGHT-10-20, "", GuiArrowButton.Direction.UP) { @@ -327,7 +327,7 @@ public class GuiReplayOverlay extends Gui { @Override public GuiElement delegate() { - if(open) { + if(toolbarOpen) { return openElements; } else { return buttonOpenToolbar; @@ -336,13 +336,17 @@ public class GuiReplayOverlay extends Gui { @Override public void draw(Minecraft mc, int mouseX, int mouseY) { - if(open) { + if(toolbarOpen) { drawGradientRect(0, maxButtonY - 10, WIDTH, HEIGHT, -1072689136, -804253680); } super.draw(mc, mouseX, mouseY); } }; + public void closeToolbar() { + toolbarOpen = false; + } + private final GuiElement content = new ComposedElement(buttonPlayPause, buttonExport, buttonPlace, buttonTime, buttonPlayPausePath, buttonZoomIn, buttonZoomOut, timeline, timelineReal, scrollbar, speedSlider, toolbar);