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

Removed UIUtils

Browse Source
This commit is contained in:
Anuken
2019-04-29 11:50:49 -04:00
parent fb724514f3
commit 29e90969eb
7 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -15,7 +15,6 @@ import io.anuke.arc.scene.style.TextureRegionDrawable;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
@@ -445,7 +444,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}
//ctrl keys (undo, redo, save)
if(UIUtils.ctrl()){
if(Core.input.ctrl()){
if(Core.input.keyTap(KeyCode.Z)){
editor.undo();
}

11
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -7,8 +7,9 @@ import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Cell;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.*;
import io.anuke.arc.util.OS;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.io.Contributors;
import io.anuke.mindustry.io.Contributors.Contributor;
@@ -37,8 +38,8 @@ public class AboutDialog extends FloatingDialog{
cont.clear();
buttons.clear();
float h = UIUtils.portrait() ? 90f : 80f;
float w = UIUtils.portrait() ? 330f : 600f;
float h = Core.graphics.isPortrait() ? 90f : 80f;
float w = Core.graphics.isPortrait() ? 330f : 600f;
Table in = new Table();
ScrollPane pane = new ScrollPane(in);
@@ -89,7 +90,7 @@ public class AboutDialog extends FloatingDialog{
buttons.addButton("$changelog.title", ui.changelog::show).size(200f, 64f);
}
if(UIUtils.portrait()){
if(Core.graphics.isPortrait()){
for(Cell<?> cell : buttons.getCells()){
cell.width(140f);
}

3
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -9,7 +9,6 @@ import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.Scaling;
import io.anuke.mindustry.game.Difficulty;
@@ -44,7 +43,7 @@ public class CustomGameDialog extends FloatingDialog{
ScrollPane pane = new ScrollPane(maps);
pane.setFadeScrollBars(false);
int maxwidth = (UIUtils.portrait() ? 2 : 4);
int maxwidth = (Core.graphics.isPortrait() ? 2 : 4);
Table selmode = new Table();
ButtonGroup<TextButton> group = new ButtonGroup<>();

3
core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -4,7 +4,6 @@ import io.anuke.arc.collection.Array;
import io.anuke.arc.scene.event.HandCursorListener;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Content;
@@ -45,7 +44,7 @@ public class DatabaseDialog extends FloatingDialog{
table.table(list -> {
list.left();
int maxWidth = UIUtils.portrait() ? 7 : 13;
int maxWidth = Core.graphics.isPortrait() ? 7 : 13;
int size = 8 * 5;
int count = 0;

3
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
View File

@@ -10,7 +10,6 @@ import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.core.Platform;
@@ -136,7 +135,7 @@ public class FileChooser extends FloatingDialog{
content.add(icontable).expandX().fillX();
content.row();
content.center().add(pane).width(UIUtils.portrait() ? Core.graphics.getWidth() / Unit.dp.scl(1) : Core.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow();
content.center().add(pane).width(Core.graphics.isPortrait() ? Core.graphics.getWidth() / Unit.dp.scl(1) : Core.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow();
content.row();
if(!open){

3
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -9,7 +9,6 @@ import io.anuke.arc.scene.style.Drawable;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Cell;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars;
@@ -302,7 +301,7 @@ public class JoinDialog extends FloatingDialog{
}
float targetWidth(){
return UIUtils.portrait() ? 350f : 500f;
return Core.graphics.isPortrait() ? 350f : 500f;
}
@SuppressWarnings("unchecked")

3
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -5,7 +5,6 @@ import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
@@ -110,7 +109,7 @@ public class MapsDialog extends FloatingDialog{
dialog = new FloatingDialog("$editor.mapinfo");
dialog.addCloseButton();
float mapsize = UIUtils.portrait() ? 160f : 300f;
float mapsize = Core.graphics.isPortrait() ? 160f : 300f;
Table table = dialog.cont;
table.stack(new Image(map.texture).setScaling(Scaling.fit), new BorderImage(map.texture).setScaling(Scaling.fit)).size(mapsize);