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

Mobile diagonal toggle / Cancel button moved

Browse Source
This commit is contained in:
Anuken
2019-05-12 11:19:31 -04:00
parent 962f413421
commit 52674b4668
9 changed files with 191 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -266,7 +266,7 @@ public class MobileInput extends InputHandler implements GestureListener{
public void buildUI(Table table){
table.addImage("blank").color(Pal.accent).height(3f).colspan(4).growX();
table.row();
table.left().margin(0f).defaults().size(48f);
table.left().margin(0f).defaults().size(49f);
table.addImageButton("icon-break", "clear-toggle-partial", 16 * 2f, () -> {
mode = mode == breaking ? block == null ? none : placing : breaking;
@@ -276,12 +276,11 @@ public class MobileInput extends InputHandler implements GestureListener{
}
}).update(l -> l.setChecked(mode == breaking));
//cancel button
table.addImageButton("icon-cancel", "clear-partial", 16 * 2f, () -> {
player.clearBuilding();
mode = none;
block = null;
}).visible(() -> player.isBuilding() || block != null || mode == breaking);
//diagonal swap button
table.addImageButton("icon-diagonal", "clear-toggle-partial", 16 * 2f, () -> {
Core.settings.put("swapdiagonal", !Core.settings.getBool("swapdiagonal"));
Core.settings.save();
}).update(l -> l.setChecked(Core.settings.getBool("swapdiagonal")));
//rotate button
table.addImageButton("icon-arrow", "clear-partial", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4))
@@ -311,6 +310,15 @@ public class MobileInput extends InputHandler implements GestureListener{
selection.clear();
selecting = false;
}).visible(() -> !selection.isEmpty());
Core.scene.table(t -> {
t.bottom().left().visible(() -> player.isBuilding() || block != null || mode == breaking);
t.addImageTextButton("$cancel", "icon-cancel", 16*2, () -> {
player.clearBuilding();
mode = none;
block = null;
}).width(155f);
});
}
@Override

1
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -124,7 +124,6 @@ public class SettingsMenuDialog extends SettingsDialog{
game.screenshakePref();
game.checkPref("effects", true);
game.checkPref("swapdiagonal", false);
if(mobile){
game.checkPref("autotarget", true);
}

2
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -142,7 +142,7 @@ public class PlacementFragment extends Fragment{
ImageButton button = blockTable.addImageButton("icon-locked", "select", 8 * 4, () -> {
if(unlocked(block)){
input.block = input.block == block ? null : block;
input.block = block;
}
}).size(46f).group(group).get();