From 7cf619e6205647a3f37837d9f036a37737092a9d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 6 Apr 2018 17:07:33 -0400
Subject: [PATCH] Back button usage cleanup

---
 core/assets/version.properties                            | 4 ++--
 .../io/anuke/mindustry/ui/dialogs/ColorPickDialog.java    | 7 +++++++
 .../src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java | 8 --------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index f9d3107813..c0b83ff852 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Thu Apr 05 22:28:48 EDT 2018
+#Fri Apr 06 17:05:53 EDT 2018
 version=release
-androidBuildCode=502
+androidBuildCode=503
 name=Mindustry
 code=3.5
 build=custom build
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java
index 244dc944ea..2711c74b73 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java
@@ -1,5 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
+import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Color;
 import io.anuke.ucore.function.Consumer;
 import io.anuke.ucore.scene.ui.Dialog;
@@ -35,6 +36,12 @@ public class ColorPickDialog extends Dialog{
                 table.row();
             }
         }
+
+        keyDown(key->{
+            if(key == Keys.ESCAPE || key == Keys.BACK)
+                hide();
+        });
+
     }
 
     public void show(Consumer<Color> cons){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
index 657a8858e8..d1263f9089 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
@@ -3,8 +3,6 @@ package io.anuke.mindustry.ui.dialogs;
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Colors;
 import com.badlogic.gdx.utils.Align;
-
-import io.anuke.ucore.core.Inputs;
 import io.anuke.ucore.scene.ui.Dialog;
 
 public class FloatingDialog extends Dialog{
@@ -26,11 +24,5 @@ public class FloatingDialog extends Dialog{
 			if(key == Keys.ESCAPE || key == Keys.BACK)
 				hide();
 		});
-
-		update(() -> {
-			if(Inputs.keyTap("menu")){
-				hide();
-			}
-		});
 	}
 }