This commit is contained in:
Anuken
2020-05-26 19:39:50 -04:00
parent ddb3afc255
commit a375dd3fc2
53 changed files with 146 additions and 315 deletions

View File

@@ -42,7 +42,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
private MapResizeDialog resizeDialog;
private MapGenerateDialog generateDialog;
private ScrollPane pane;
private FloatingDialog menu;
private BaseDialog menu;
private Rules lastSavedRules;
private boolean saved = false;
private boolean shownWithMap = false;
@@ -58,7 +58,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
infoDialog = new MapInfoDialog(editor);
generateDialog = new MapGenerateDialog(editor, true);
menu = new FloatingDialog("$menu");
menu = new BaseDialog("$menu");
menu.addCloseButton();
float swidth = 180f;
@@ -309,7 +309,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
* 3) listener
*/
private void createDialog(String title, Object... arguments){
FloatingDialog dialog = new FloatingDialog(title);
BaseDialog dialog = new BaseDialog(title);
float h = 90f;

View File

@@ -26,7 +26,7 @@ import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*;
@SuppressWarnings("unchecked")
public class MapGenerateDialog extends FloatingDialog{
public class MapGenerateDialog extends BaseDialog{
private final Prov<GenerateFilter>[] filterTypes = new Prov[]{
NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new,
RiverNoiseFilter::new, OreFilter::new, OreMedianFilter::new, MedianFilter::new,
@@ -284,7 +284,7 @@ public class MapGenerateDialog extends FloatingDialog{
}
void showAdd(){
FloatingDialog selection = new FloatingDialog("$add");
BaseDialog selection = new BaseDialog("$add");
selection.setFillParent(false);
selection.cont.defaults().size(210f, 60f);
int i = 0;

View File

@@ -9,7 +9,7 @@ import mindustry.io.*;
import mindustry.ui.*;
import mindustry.ui.dialogs.*;
public class MapInfoDialog extends FloatingDialog{
public class MapInfoDialog extends BaseDialog{
private final MapEditor editor;
private final WaveInfoDialog waveInfo;
private final MapGenerateDialog generate;

View File

@@ -10,7 +10,7 @@ import mindustry.ui.dialogs.*;
import static mindustry.Vars.maps;
public class MapLoadDialog extends FloatingDialog{
public class MapLoadDialog extends BaseDialog{
private Map selected = null;
public MapLoadDialog(Cons<Map> loader){

View File

@@ -6,7 +6,7 @@ import arc.scene.ui.layout.*;
import mindustry.gen.*;
import mindustry.ui.dialogs.*;
public class MapResizeDialog extends FloatingDialog{
public class MapResizeDialog extends BaseDialog{
private static final int minSize = 50, maxSize = 500, increment = 50;
int width, height;

View File

@@ -8,7 +8,7 @@ import mindustry.ui.dialogs.*;
import static mindustry.Vars.ui;
public class MapSaveDialog extends FloatingDialog{
public class MapSaveDialog extends BaseDialog{
private TextField field;
private Cons<String> listener;

View File

@@ -24,7 +24,7 @@ import mindustry.ui.dialogs.*;
import static mindustry.Vars.*;
import static mindustry.game.SpawnGroup.never;
public class WaveInfoDialog extends FloatingDialog{
public class WaveInfoDialog extends BaseDialog{
private final static int displayed = 20;
private Array<SpawnGroup> groups = new Array<>();
@@ -49,7 +49,7 @@ public class WaveInfoDialog extends FloatingDialog{
addCloseButton();
buttons.button("$waves.edit", () -> {
FloatingDialog dialog = new FloatingDialog("$waves.edit");
BaseDialog dialog = new BaseDialog("$waves.edit");
dialog.addCloseButton();
dialog.setFillParent(false);
dialog.cont.defaults().size(210f, 64f);
@@ -235,7 +235,7 @@ public class WaveInfoDialog extends FloatingDialog{
}
void showUpdate(SpawnGroup group){
FloatingDialog dialog = new FloatingDialog("");
BaseDialog dialog = new BaseDialog("");
dialog.setFillParent(true);
dialog.cont.pane(p -> {
int i = 0;