Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better filter layout

Browse Source
This commit is contained in:
Anuken
2019-03-15 20:32:08 -04:00
parent 6cef301b94
commit d038bdb6ce
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -100,7 +100,7 @@ public class AndroidLauncher extends AndroidApplication{
@Override @Override
public void beginForceLandscape(){ public void beginForceLandscape(){
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
} }
@Override @Override

1
core/assets/bundles/bundle.properties
View File

@@ -242,6 +242,7 @@ editor.mapname = Map Name:
editor.overwrite = [accent]Warning!\nThis overwrites an existing map. 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.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: editor.selectmap = Select a map to load:
filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
filter.distort = Distort filter.distort = Distort
filter.noise = Noise filter.noise = Noise
filter.ore = Ore filter.ore = Ore

21
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@@ -7,7 +7,6 @@ import io.anuke.arc.graphics.Pixmap;
import io.anuke.arc.graphics.Pixmap.Format; import io.anuke.arc.graphics.Pixmap.Format;
import io.anuke.arc.graphics.Texture; import io.anuke.arc.graphics.Texture;
import io.anuke.arc.scene.ui.layout.Table; 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.AsyncExecutor;
import io.anuke.arc.util.async.AsyncResult; import io.anuke.arc.util.async.AsyncResult;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
@@ -51,13 +50,15 @@ public class MapGenerateDialog extends FloatingDialog{
buttons.addButton("$editor.apply", () -> { buttons.addButton("$editor.apply", () -> {
apply(); apply();
hide(); hide();
}).size(180f, 64f); }).size(160f, 64f);
buttons.addButton("$editor.randomize", () -> { buttons.addButton("$editor.randomize", () -> {
for(GenerateFilter filter : filters){ for(GenerateFilter filter : filters){
filter.randomize(); filter.randomize();
} }
update(); update();
}).size(180f, 64f); }).size(160f, 64f);
buttons.addImageTextButton("$add", "icon-add", 14*2, this::showAdd).height(64f).width(140f);
} }
void setup(){ void setup(){
@@ -74,18 +75,16 @@ public class MapGenerateDialog extends FloatingDialog{
cont.clear(); cont.clear();
cont.table("flat", t -> { cont.table("flat", t -> {
t.margin(8f); t.margin(8f);
t.add(new BorderImage(texture)).grow().padRight(6).top().get().setScaling(Scaling.fit); t.add(new BorderImage(texture)).size(400f).padRight(6);
t.table(right -> { t.pane(p -> filterTable = p).width(300f).get().setScrollingDisabled(true, false);
right.pane(p -> filterTable = p).grow().get().setScrollingDisabled(true, false);
right.row();
right.addButton("$add", this::showAdd).fillX().height(50f);
}).grow();
}).grow(); }).grow();
update(); update();
buffer1 = create(); buffer1 = create();
buffer2 = create(); buffer2 = create();
rebuildFilters();
} }
DummyTile[][] create(){ DummyTile[][] create(){
@@ -151,6 +150,10 @@ public class MapGenerateDialog extends FloatingDialog{
}).pad(3).padTop(0).width(280f); }).pad(3).padTop(0).width(280f);
filterTable.row(); filterTable.row();
} }
if(filters.isEmpty()){
filterTable.add("$filters.empty").wrap().width(200f);
}
} }
void showAdd(){ void showAdd(){