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

generation UI fix + other miniscule ui fix (#7117)

Browse Source
This commit is contained in:
JniTrRny
2022-07-04 00:54:30 +07:00
committed by GitHub
parent 685e3cac83
commit 0201e08ac9
7 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/dialogs/KeybindDialog.java
View File

@@ -27,7 +27,7 @@ public class KeybindDialog extends Dialog{
protected ObjectIntMap<Section> sectionControls = new ObjectIntMap<>();
public KeybindDialog(){
super(bundle.get("keybind.title", "Rebind Keys"));
super(bundle.get("keybind.title"));
setup();
addCloseButton();
setFillParent(true);
@@ -154,7 +154,7 @@ public class KeybindDialog extends Dialog{
openDialog(section, keybind);
}).width(130f);
}
table.button("@settings.resetKey", tstyle, () -> keybinds.resetToDefault(section, keybind)).width(130f);
table.button("@settings.resetKey", tstyle, () -> keybinds.resetToDefault(section, keybind)).width(130f).pad(2f).padLeft(4f);
table.row();
}
@@ -194,7 +194,7 @@ public class KeybindDialog extends Dialog{
}
private void openDialog(Section section, KeyBind name){
rebindDialog = new Dialog(rebindAxis ? bundle.get("keybind.press.axis", "Press an axis or key...") : bundle.get("keybind.press", "Press a key..."));
rebindDialog = new Dialog(rebindAxis ? bundle.get("keybind.press.axis") : bundle.get("keybind.press"));
rebindKey = name;

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

@@ -270,26 +270,26 @@ public class SettingsMenuDialog extends BaseDialog{
TextButtonStyle style = Styles.flatt;
float marg = 8f, isize = iconMed;
float isize = iconMed;
menu.defaults().size(300f, 60f);
menu.button("@settings.game", Icon.settings, style, isize, () -> visible(0)).marginLeft(marg).row();
menu.button("@settings.graphics", Icon.image, style, isize, () -> visible(1)).marginLeft(marg).row();
menu.button("@settings.sound", Icon.filters, style, isize, () -> visible(2)).marginLeft(marg).row();
menu.button("@settings.language", Icon.chat, style, isize, ui.language::show).marginLeft(marg).row();
menu.defaults().size(300f, 60f).marginLeft(8f);
menu.button("@settings.game", Icon.settings, style, isize, () -> visible(0)).row();
menu.button("@settings.graphics", Icon.image, style, isize, () -> visible(1)).row();
menu.button("@settings.sound", Icon.filters, style, isize, () -> visible(2)).row();
menu.button("@settings.language", Icon.chat, style, isize, ui.language::show).row();
if(!mobile || Core.settings.getBool("keyboard")){
menu.button("@settings.controls", Icon.move, style, isize, ui.controls::show).marginLeft(marg).row();
menu.button("@settings.controls", Icon.move, style, isize, ui.controls::show).row();
}
menu.button("@settings.data", Icon.save, style, isize, () -> dataDialog.show()).marginLeft(marg).row();
menu.button("@settings.data", Icon.save, style, isize, () -> dataDialog.show()).row();
int i = 3;
for(var cat : categories){
int index = i;
if(cat.icon == null){
menu.button(cat.name, style, () -> visible(index)).marginLeft(marg).row();
menu.button(cat.name, style, () -> visible(index)).row();
}else{
menu.button(cat.name, cat.icon, style, isize, () -> visible(index)).with(b -> ((Image)b.getChildren().get(1)).setScaling(Scaling.fit)).marginLeft(marg).row();
menu.button(cat.name, cat.icon, style, isize, () -> visible(index)).with(b -> ((Image)b.getChildren().get(1)).setScaling(Scaling.fit)).row();
}
i++;
}
@@ -438,22 +438,19 @@ public class SettingsMenuDialog extends BaseDialog{
}
graphics.checkPref("effects", true);
graphics.checkPref("atmosphere", !mobile);
graphics.checkPref("destroyedblocks", true);
graphics.checkPref("blockstatus", false);
graphics.checkPref("playerchat", true);
if(!mobile){
graphics.checkPref("coreitems", true);
}
if(!mobile) graphics.checkPref("coreitems", true);
graphics.row();
graphics.checkPref("minimap", !mobile);
graphics.checkPref("smoothcamera", true);
graphics.checkPref("position", false);
if(!mobile){
graphics.checkPref("mouseposition", false);
}
if(!mobile) graphics.checkPref("mouseposition", false);
graphics.checkPref("fps", false);
graphics.checkPref("playerindicators", true);
graphics.checkPref("indicators", true);
graphics.checkPref("atmosphere", !mobile);
graphics.checkPref("showweather", true);
graphics.checkPref("animatedwater", true);