From e1dfb68cfde0eb751dde947ad9c3cc9dd12ac824 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 30 May 2020 12:12:04 -0400 Subject: [PATCH] Preparation for moving planet dialog --- core/src/mindustry/ui/dialogs/PlanetDialog.java | 12 +++++++++--- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index cb0f22c3a0..7eda1a76d1 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -87,11 +87,17 @@ public class PlanetDialog extends BaseDialog{ getCell(buttons).padBottom(-4); buttons.background(Styles.black).defaults().growX().height(64f).pad(0); + keyDown(key -> { + if(key == KeyCode.escape || key == KeyCode.back){ + Core.app.post(this::hide); + } + }); + //TODO - buttons.button("$back", Icon.left, style, this::hide).margin(bmargin); - buttons.button("Research", Icon.tree, style, () -> ui.tech.show()).margin(bmargin); + //buttons.button("$back", Icon.left, style, this::hide).margin(bmargin); + //buttons.button("Research", Icon.tree, style, () -> ui.tech.show()).margin(bmargin); //buttons.button("Database", Icon.book, style, () -> ui.database.show()).margin(bmargin); - buttons.button("Resources", Icon.file, style, resources::show).margin(bmargin); + //buttons.button("Resources", Icon.file, style, resources::show).margin(bmargin); cam.fov = 60f; diff --git a/gradle.properties b/gradle.properties index 659ecceca0..90a53a1595 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=316daf68d366d591ea1ae3caa30b1a5c0d838098 +archash=fc5fd01cd2bfc1a95171f212e601ac030ee3e58f