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

Add sector icon picker back button (#4682)

Browse Source
This commit is contained in:
Joshua Fan
2021-02-15 07:41:56 -08:00
committed by GitHub
parent af39d6a6ee
commit e528e35e06
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/dialogs/ControlsDialog.java
View File

@@ -17,7 +17,7 @@ public class ControlsDialog extends KeybindDialog{
@Override @Override
public void addCloseButton(){ public void addCloseButton(){
buttons.button("@back", Icon.left, this::hide).size(230f, 64f); buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
keyDown(key -> { keyDown(key -> {
if(key == KeyCode.escape || key == KeyCode.back) hide(); if(key == KeyCode.escape || key == KeyCode.back) hide();

7
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -208,11 +208,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
void addBack(){ void addBack(){
buttons.button("@back", Icon.left, this::hide).size(200, 54).pad(2).bottom(); buttons.button("@back", Icon.left, this::hide).size(200f, 54f).pad(2).bottom();
} }
void addTech(){ void addTech(){
buttons.button("@techtree", Icon.tree, () -> ui.research.show()).size(200, 54).pad(2).bottom(); buttons.button("@techtree", Icon.tree, () -> ui.research.show()).size(200f, 54f).pad(2).bottom();
} }
public void showOverview(){ public void showOverview(){
@@ -677,7 +677,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
setFillParent(true); setFillParent(true);
cont.pane(t -> { cont.pane(t -> {
t.marginRight(19f); t.marginRight(19f);
t.defaults().size(48); t.defaults().size(48f);
t.button(Icon.none, Styles.clearTogglei, () -> { t.button(Icon.none, Styles.clearTogglei, () -> {
sector.info.icon = null; sector.info.icon = null;
@@ -701,6 +701,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
if(++i % 8 == 0) t.row(); if(++i % 8 == 0) t.row();
} }
}); });
buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
}}.show(); }}.show();
}).size(40f); }).size(40f);
}).row(); }).row();

4
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -501,13 +501,13 @@ public class SettingsMenuDialog extends SettingsDialog{
@Override @Override
public void addCloseButton(){ public void addCloseButton(){
buttons.button("@back", Icon.leftOpen, () -> { buttons.button("@back", Icon.left, () -> {
if(prefs.getChildren().first() != menu){ if(prefs.getChildren().first() != menu){
back(); back();
}else{ }else{
hide(); hide();
} }
}).size(230f, 64f); }).size(210f, 64f);
keyDown(key -> { keyDown(key -> {
if(key == KeyCode.escape || key == KeyCode.back){ if(key == KeyCode.escape || key == KeyCode.back){