Close Toolbar in GuiReplayOverlay when GuiMouseInput is closed

This commit is contained in:
CrushedPixel
2015-07-17 12:15:35 +02:00
parent efd82861c2
commit 7094a18106
2 changed files with 14 additions and 5 deletions

View File

@@ -38,4 +38,9 @@ public class GuiMouseInput extends GuiScreen {
super.keyTyped(typedChar, keyCode); super.keyTyped(typedChar, keyCode);
} }
@Override
public void onGuiClosed() {
ReplayMod.overlay.closeToolbar();
}
} }

View File

@@ -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 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 final DelegatingElement toolbar = new DelegatingElement() {
private boolean open = false;
private void toggleOpen() { private void toggleOpen() {
open = !open; toolbarOpen = !toolbarOpen;
} }
private GuiElement buttonOpenToolbar = new GuiArrowButton(-1, 10, HEIGHT-10-20, "", GuiArrowButton.Direction.UP) { private GuiElement buttonOpenToolbar = new GuiArrowButton(-1, 10, HEIGHT-10-20, "", GuiArrowButton.Direction.UP) {
@@ -327,7 +327,7 @@ public class GuiReplayOverlay extends Gui {
@Override @Override
public GuiElement delegate() { public GuiElement delegate() {
if(open) { if(toolbarOpen) {
return openElements; return openElements;
} else { } else {
return buttonOpenToolbar; return buttonOpenToolbar;
@@ -336,13 +336,17 @@ public class GuiReplayOverlay extends Gui {
@Override @Override
public void draw(Minecraft mc, int mouseX, int mouseY) { public void draw(Minecraft mc, int mouseX, int mouseY) {
if(open) { if(toolbarOpen) {
drawGradientRect(0, maxButtonY - 10, WIDTH, HEIGHT, -1072689136, -804253680); drawGradientRect(0, maxButtonY - 10, WIDTH, HEIGHT, -1072689136, -804253680);
} }
super.draw(mc, mouseX, mouseY); super.draw(mc, mouseX, mouseY);
} }
}; };
public void closeToolbar() {
toolbarOpen = false;
}
private final GuiElement content = new ComposedElement(buttonPlayPause, buttonExport, buttonPlace, buttonTime, private final GuiElement content = new ComposedElement(buttonPlayPause, buttonExport, buttonPlace, buttonTime,
buttonPlayPausePath, buttonZoomIn, buttonZoomOut, timeline, timelineReal, scrollbar, speedSlider, toolbar); buttonPlayPausePath, buttonZoomIn, buttonZoomOut, timeline, timelineReal, scrollbar, speedSlider, toolbar);