Manually toggle GuiCheckButtons in GuiRenderSettings' actionPerformed

Properly set Selection box when modifying other number input box
This commit is contained in:
CrushedPixel
2015-06-04 01:20:38 +02:00
parent 075dfadf0d
commit a8c5e98c29

View File

@@ -74,8 +74,8 @@ public class GuiRenderSettings extends GuiScreen {
xRes = new GuiNumberInput(GuiConstants.RENDER_SETTINGS_RESOLUTION_X, fontRendererObj, 0, 0, 50, 1, 100000, mc.displayWidth, false) { xRes = new GuiNumberInput(GuiConstants.RENDER_SETTINGS_RESOLUTION_X, fontRendererObj, 0, 0, 50, 1, 100000, mc.displayWidth, false) {
@Override @Override
public void setCursorPosition(int p_146190_1_) { public void moveCursorBy(int move) {
super.setCursorPosition(p_146190_1_); super.moveCursorBy(move);
RendererSettings renderer = rendererDropdown.getElement(rendererDropdown.getSelectionIndex()); RendererSettings renderer = rendererDropdown.getElement(rendererDropdown.getSelectionIndex());
Integer value = getIntValueNullable(); Integer value = getIntValueNullable();
if (value != null) { if (value != null) {
@@ -86,12 +86,13 @@ public class GuiRenderSettings extends GuiScreen {
yRes.text = Integer.toString(Math.max(1, value / 2)); yRes.text = Integer.toString(Math.max(1, value / 2));
} }
} }
yRes.setCursorPositionEnd();
} }
}; };
yRes = new GuiNumberInput(GuiConstants.RENDER_SETTINGS_RESOLUTION_Y, fontRendererObj, 0, 0, 50, 1, 100000, mc.displayHeight, false) { yRes = new GuiNumberInput(GuiConstants.RENDER_SETTINGS_RESOLUTION_Y, fontRendererObj, 0, 0, 50, 1, 100000, mc.displayHeight, false) {
@Override @Override
public void setCursorPosition(int p_146190_1_) { public void moveCursorBy(int move) {
super.setCursorPosition(p_146190_1_); super.moveCursorBy(move);
RendererSettings renderer = rendererDropdown.getElement(rendererDropdown.getSelectionIndex()); RendererSettings renderer = rendererDropdown.getElement(rendererDropdown.getSelectionIndex());
Integer value = getIntValueNullable(); Integer value = getIntValueNullable();
if (value != null) { if (value != null) {
@@ -102,6 +103,7 @@ public class GuiRenderSettings extends GuiScreen {
xRes.text = Integer.toString(value * 2); xRes.text = Integer.toString(value * 2);
} }
} }
xRes.setCursorPositionEnd();
} }
}; };
@@ -310,7 +312,10 @@ public class GuiRenderSettings extends GuiScreen {
@Override @Override
protected void actionPerformed(GuiButton button) throws IOException { protected void actionPerformed(GuiButton button) throws IOException {
if(!button.enabled) return; if(!button.enabled) return;
if(permanentButtons.contains(button)) { if(permanentButtons.contains(button)) {
if(button instanceof GuiCheckBox)
((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked());
if(button.id == GuiConstants.RENDER_SETTINGS_RENDER_BUTTON) { if(button.id == GuiConstants.RENDER_SETTINGS_RENDER_BUTTON) {
startRendering(); startRendering();
@@ -323,15 +328,17 @@ public class GuiRenderSettings extends GuiScreen {
} }
} else if(defaultButtons.contains(button) && !advancedTab) { } else if(defaultButtons.contains(button) && !advancedTab) {
if(button instanceof GuiCheckBox)
((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked());
if(button.id == GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX) { if(button.id == GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX) {
customResolution.setIsChecked(!customResolution.isChecked());
boolean enabled = customResolution.isChecked(); boolean enabled = customResolution.isChecked();
xRes.setEnabled(enabled); xRes.setEnabled(enabled);
yRes.setEnabled(enabled); yRes.setEnabled(enabled);
} }
} else if(advancedButtons.contains(button) && advancedTab) { } else if(advancedButtons.contains(button) && advancedTab) {
if(button instanceof GuiCheckBox)
((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked());
if(button instanceof GuiToggleButton) { if(button instanceof GuiToggleButton) {
((GuiToggleButton)button).toggle(); ((GuiToggleButton)button).toggle();
@@ -339,7 +346,6 @@ public class GuiRenderSettings extends GuiScreen {
((GuiColorPicker)button).pickerToggled(); ((GuiColorPicker)button).pickerToggled();
} else { } else {
if(button.id == GuiConstants.RENDER_SETTINGS_ENABLE_GREENSCREEN) { if(button.id == GuiConstants.RENDER_SETTINGS_ENABLE_GREENSCREEN) {
enableGreenscreen.setIsChecked(!enableGreenscreen.isChecked());
colorPicker.enabled = enableGreenscreen.isChecked(); colorPicker.enabled = enableGreenscreen.isChecked();
} }
} }
@@ -432,8 +438,12 @@ public class GuiRenderSettings extends GuiScreen {
youtubeExport.enabled = ignoreCamDir.enabled = true; youtubeExport.enabled = ignoreCamDir.enabled = true;
} }
xRes.setCursorPositionEnd(); xRes.setCursorPositionEnd();
xRes.setSelectionPos(xRes.getCursorPosition());
yRes.setCursorPositionEnd(); yRes.setCursorPositionEnd();
yRes.setSelectionPos(yRes.getCursorPosition());
} }
} }
} }