mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
cleanup
This commit is contained in:
@@ -118,12 +118,7 @@ public class SettingsScene extends UIScene {
|
|||||||
|
|
||||||
private void addSettingField(String name, int value, ChangeListener change) {
|
private void addSettingField(String name, int value, ChangeListener change) {
|
||||||
TextField text = Controls.newTextField(String.valueOf(value));
|
TextField text = Controls.newTextField(String.valueOf(value));
|
||||||
text.setTextFieldFilter(new TextField.TextFieldFilter() {
|
text.setTextFieldFilter((textField, c) -> Character.isDigit(c));
|
||||||
@Override
|
|
||||||
public boolean acceptChar(TextField textField, char c) {
|
|
||||||
return Character.isDigit(c);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
text.addListener(change);
|
text.addListener(change);
|
||||||
addLabel(name);
|
addLabel(name);
|
||||||
settingGroup.add(text).align(Align.right);
|
settingGroup.add(text).align(Align.right);
|
||||||
@@ -145,103 +140,85 @@ public class SettingsScene extends UIScene {
|
|||||||
Preference = new ForgePreferences();
|
Preference = new ForgePreferences();
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectBox plane = Controls.newComboBox(Config.instance().getAllAdventures(), Config.instance().getSettingData().plane, new Function<Object, Void>() {
|
SelectBox plane = Controls.newComboBox(Config.instance().getAllAdventures(), Config.instance().getSettingData().plane, o -> {
|
||||||
@Override
|
Config.instance().getSettingData().plane = (String) o;
|
||||||
public Void apply(Object o) {
|
Config.instance().saveSettings();
|
||||||
Config.instance().getSettingData().plane = (String) o;
|
return null;
|
||||||
Config.instance().saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
addLabel(Forge.getLocalizer().getMessage("lblWorld"));
|
addLabel(Forge.getLocalizer().getMessage("lblWorld"));
|
||||||
settingGroup.add(plane).align(Align.right).pad(2);
|
settingGroup.add(plane).align(Align.right).pad(2);
|
||||||
|
|
||||||
if (!GuiBase.isAndroid()) {
|
if (!GuiBase.isAndroid()) {
|
||||||
SelectBox videomode = Controls.newComboBox(new String[]{"720p", "768p", "900p", "1080p"}, Config.instance().getSettingData().videomode, new Function<Object, Void>() {
|
SelectBox videomode = Controls.newComboBox(new String[]{"720p", "768p", "900p", "1080p"}, Config.instance().getSettingData().videomode, o -> {
|
||||||
@Override
|
String mode = (String) o;
|
||||||
public Void apply(Object o) {
|
if (mode == null)
|
||||||
String mode = (String) o;
|
mode = "720p";
|
||||||
if (mode == null)
|
Config.instance().getSettingData().videomode = mode;
|
||||||
mode = "720p";
|
if (mode.equalsIgnoreCase("768p")) {
|
||||||
Config.instance().getSettingData().videomode = mode;
|
Config.instance().getSettingData().width = 1366;
|
||||||
if (mode.equalsIgnoreCase("768p")) {
|
Config.instance().getSettingData().height = 768;
|
||||||
Config.instance().getSettingData().width = 1366;
|
} else if (mode.equalsIgnoreCase("900p")) {
|
||||||
Config.instance().getSettingData().height = 768;
|
Config.instance().getSettingData().width = 1600;
|
||||||
} else if (mode.equalsIgnoreCase("900p")) {
|
Config.instance().getSettingData().height = 900;
|
||||||
Config.instance().getSettingData().width = 1600;
|
} else if (mode.equalsIgnoreCase("1080p")) {
|
||||||
Config.instance().getSettingData().height = 900;
|
Config.instance().getSettingData().width = 1920;
|
||||||
} else if (mode.equalsIgnoreCase("1080p")) {
|
Config.instance().getSettingData().height = 1080;
|
||||||
Config.instance().getSettingData().width = 1920;
|
} else {
|
||||||
Config.instance().getSettingData().height = 1080;
|
Config.instance().getSettingData().width = 1280;
|
||||||
} else {
|
Config.instance().getSettingData().height = 720;
|
||||||
Config.instance().getSettingData().width = 1280;
|
|
||||||
Config.instance().getSettingData().height = 720;
|
|
||||||
}
|
|
||||||
Config.instance().saveSettings();
|
|
||||||
//update preference for classic mode if needed
|
|
||||||
if (FModel.getPreferences().getPref(ForgePreferences.FPref.UI_VIDEO_MODE) != mode) {
|
|
||||||
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_VIDEO_MODE, mode);
|
|
||||||
FModel.getPreferences().save();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
Config.instance().saveSettings();
|
||||||
|
//update preference for classic mode if needed
|
||||||
|
if (FModel.getPreferences().getPref(ForgePreferences.FPref.UI_VIDEO_MODE) != mode) {
|
||||||
|
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_VIDEO_MODE, mode);
|
||||||
|
FModel.getPreferences().save();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
});
|
});
|
||||||
addLabel(Forge.getLocalizer().getMessage("lblVideoMode"));
|
addLabel(Forge.getLocalizer().getMessage("lblVideoMode"));
|
||||||
settingGroup.add(videomode).align(Align.right).pad(2);
|
settingGroup.add(videomode).align(Align.right).pad(2);
|
||||||
}
|
}
|
||||||
if (Forge.isLandscapeMode()) {
|
if (Forge.isLandscapeMode()) {
|
||||||
//different adjustment to landscape
|
//different adjustment to landscape
|
||||||
SelectBox rewardCardAdjLandscape = Controls.newComboBox(new Float[]{0.6f, 0.65f, 0.7f, 0.75f, 0.8f, 0.85f, 0.9f, 1f, 1.05f, 1.1f, 1.15f, 1.2f, 1.25f, 1.3f, 1.35f, 1.4f, 1.45f, 1.5f, 1.55f, 1.6f}, Config.instance().getSettingData().rewardCardAdjLandscape, new Function<Object, Void>() {
|
SelectBox rewardCardAdjLandscape = Controls.newComboBox(new Float[]{0.6f, 0.65f, 0.7f, 0.75f, 0.8f, 0.85f, 0.9f, 1f, 1.05f, 1.1f, 1.15f, 1.2f, 1.25f, 1.3f, 1.35f, 1.4f, 1.45f, 1.5f, 1.55f, 1.6f}, Config.instance().getSettingData().rewardCardAdjLandscape, o -> {
|
||||||
@Override
|
Float val = (Float) o;
|
||||||
public Void apply(Object o) {
|
if (val == null || val == 0f)
|
||||||
Float val = (Float) o;
|
val = 1f;
|
||||||
if (val == null || val == 0f)
|
Config.instance().getSettingData().rewardCardAdjLandscape = val;
|
||||||
val = 1f;
|
Config.instance().saveSettings();
|
||||||
Config.instance().getSettingData().rewardCardAdjLandscape = val;
|
return null;
|
||||||
Config.instance().saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
addLabel("Reward/Shop Card Display Ratio");
|
addLabel("Reward/Shop Card Display Ratio");
|
||||||
settingGroup.add(rewardCardAdjLandscape).align(Align.right).pad(2);
|
settingGroup.add(rewardCardAdjLandscape).align(Align.right).pad(2);
|
||||||
SelectBox tooltipAdjLandscape = Controls.newComboBox(new Float[]{0.6f, 0.65f, 0.7f, 0.75f, 0.8f, 0.85f, 0.9f, 1f, 1.05f, 1.1f, 1.15f, 1.2f, 1.25f, 1.3f, 1.35f, 1.4f, 1.45f, 1.5f, 1.55f, 1.6f}, Config.instance().getSettingData().cardTooltipAdjLandscape, new Function<Object, Void>() {
|
SelectBox tooltipAdjLandscape = Controls.newComboBox(new Float[]{0.6f, 0.65f, 0.7f, 0.75f, 0.8f, 0.85f, 0.9f, 1f, 1.05f, 1.1f, 1.15f, 1.2f, 1.25f, 1.3f, 1.35f, 1.4f, 1.45f, 1.5f, 1.55f, 1.6f}, Config.instance().getSettingData().cardTooltipAdjLandscape, o -> {
|
||||||
@Override
|
Float val = (Float) o;
|
||||||
public Void apply(Object o) {
|
if (val == null || val == 0f)
|
||||||
Float val = (Float) o;
|
val = 1f;
|
||||||
if (val == null || val == 0f)
|
Config.instance().getSettingData().cardTooltipAdjLandscape = val;
|
||||||
val = 1f;
|
Config.instance().saveSettings();
|
||||||
Config.instance().getSettingData().cardTooltipAdjLandscape = val;
|
return null;
|
||||||
Config.instance().saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
addLabel("Reward/Shop Card Tooltip Ratio");
|
addLabel("Reward/Shop Card Tooltip Ratio");
|
||||||
settingGroup.add(tooltipAdjLandscape).align(Align.right).pad(2);
|
settingGroup.add(tooltipAdjLandscape).align(Align.right).pad(2);
|
||||||
} else {
|
} else {
|
||||||
//portrait adjustment
|
//portrait adjustment
|
||||||
SelectBox rewardCardAdj = Controls.newComboBox(new Float[]{0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.8f, 1.9f, 2f}, Config.instance().getSettingData().rewardCardAdj, new Function<Object, Void>() {
|
SelectBox rewardCardAdj = Controls.newComboBox(new Float[]{0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.8f, 1.9f, 2f}, Config.instance().getSettingData().rewardCardAdj, o -> {
|
||||||
@Override
|
Float val = (Float) o;
|
||||||
public Void apply(Object o) {
|
if (val == null || val == 0f)
|
||||||
Float val = (Float) o;
|
val = 1f;
|
||||||
if (val == null || val == 0f)
|
Config.instance().getSettingData().rewardCardAdj = val;
|
||||||
val = 1f;
|
Config.instance().saveSettings();
|
||||||
Config.instance().getSettingData().rewardCardAdj = val;
|
return null;
|
||||||
Config.instance().saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
addLabel("Reward/Shop Card Display Ratio");
|
addLabel("Reward/Shop Card Display Ratio");
|
||||||
settingGroup.add(rewardCardAdj).align(Align.right).pad(2);
|
settingGroup.add(rewardCardAdj).align(Align.right).pad(2);
|
||||||
SelectBox tooltipAdj = Controls.newComboBox(new Float[]{0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.8f, 1.9f, 2f}, Config.instance().getSettingData().cardTooltipAdj, new Function<Object, Void>() {
|
SelectBox tooltipAdj = Controls.newComboBox(new Float[]{0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.8f, 1.9f, 2f}, Config.instance().getSettingData().cardTooltipAdj, o -> {
|
||||||
@Override
|
Float val = (Float) o;
|
||||||
public Void apply(Object o) {
|
if (val == null || val == 0f)
|
||||||
Float val = (Float) o;
|
val = 1f;
|
||||||
if (val == null || val == 0f)
|
Config.instance().getSettingData().cardTooltipAdj = val;
|
||||||
val = 1f;
|
Config.instance().saveSettings();
|
||||||
Config.instance().getSettingData().cardTooltipAdj = val;
|
return null;
|
||||||
Config.instance().saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
addLabel("Reward/Shop Card Tooltip Ratio");
|
addLabel("Reward/Shop Card Tooltip Ratio");
|
||||||
settingGroup.add(tooltipAdj).align(Align.right).pad(2);
|
settingGroup.add(tooltipAdj).align(Align.right).pad(2);
|
||||||
@@ -290,12 +267,7 @@ public class SettingsScene extends UIScene {
|
|||||||
settingGroup.row();
|
settingGroup.row();
|
||||||
back = ui.findActor("return");
|
back = ui.findActor("return");
|
||||||
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
|
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
|
||||||
ui.onButtonPress("return", new Runnable() {
|
ui.onButtonPress("return", () -> SettingsScene.this.back());
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
SettingsScene.this.back();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
ScrollPane scrollPane = ui.findActor("settings");
|
ScrollPane scrollPane = ui.findActor("settings");
|
||||||
scrollPane.setActor(settingGroup);
|
scrollPane.setActor(settingGroup);
|
||||||
|
|||||||
Reference in New Issue
Block a user