diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 3751276c95..ef7785e102 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -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(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index a4297444fa..d243e3220c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -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); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index e7c6829cb0..b0cd47ee60 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -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 group = new ButtonGroup<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index 1c094e841e..602e7c31fd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -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; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 38a27083f6..ca35333bef 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -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){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index 3771f67ff7..96c495687e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -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") diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 87a6f4c805..7e4015f0fd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -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);