From d038bdb6ce05d12cd8e0ae6cfa8adb9b262a2f90 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 Mar 2019 20:32:08 -0400
Subject: [PATCH] Better filter layout

---
 .../io/anuke/mindustry/AndroidLauncher.java   |  2 +-
 core/assets/bundles/bundle.properties         |  1 +
 .../mindustry/editor/MapGenerateDialog.java   | 21 +++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java
index 49a55ff716..a7bb47034b 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -100,7 +100,7 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public void beginForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
             }
 
             @Override
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 065521660e..9a7e3fde5c 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -242,6 +242,7 @@ editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
 editor.selectmap = Select a map to load:
+filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.ore = Ore
diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
index bcb7e06c9e..bae20da504 100644
--- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
@@ -7,7 +7,6 @@ import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Scaling;
 import io.anuke.arc.util.async.AsyncExecutor;
 import io.anuke.arc.util.async.AsyncResult;
 import io.anuke.mindustry.content.Blocks;
@@ -51,13 +50,15 @@ public class MapGenerateDialog extends FloatingDialog{
         buttons.addButton("$editor.apply", () -> {
             apply();
             hide();
-        }).size(180f, 64f);
+        }).size(160f, 64f);
         buttons.addButton("$editor.randomize", () -> {
             for(GenerateFilter filter : filters){
                 filter.randomize();
             }
             update();
-        }).size(180f, 64f);
+        }).size(160f, 64f);
+
+        buttons.addImageTextButton("$add", "icon-add", 14*2, this::showAdd).height(64f).width(140f);
     }
 
     void setup(){
@@ -74,18 +75,16 @@ public class MapGenerateDialog extends FloatingDialog{
         cont.clear();
         cont.table("flat", t -> {
             t.margin(8f);
-            t.add(new BorderImage(texture)).grow().padRight(6).top().get().setScaling(Scaling.fit);
-            t.table(right -> {
-                right.pane(p -> filterTable = p).grow().get().setScrollingDisabled(true, false);
-                right.row();
-                right.addButton("$add", this::showAdd).fillX().height(50f);
-            }).grow();
+            t.add(new BorderImage(texture)).size(400f).padRight(6);
+            t.pane(p -> filterTable = p).width(300f).get().setScrollingDisabled(true, false);
         }).grow();
 
         update();
 
         buffer1 = create();
         buffer2 = create();
+
+        rebuildFilters();
     }
 
     DummyTile[][] create(){
@@ -151,6 +150,10 @@ public class MapGenerateDialog extends FloatingDialog{
             }).pad(3).padTop(0).width(280f);
             filterTable.row();
         }
+
+        if(filters.isEmpty()){
+            filterTable.add("$filters.empty").wrap().width(200f);
+        }
     }
 
     void showAdd(){