Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix optionmenu always updating and rendering

Browse Source
This commit is contained in:
yugecin 2018-08-27 22:00:02 +02:00
parent 787ad8c522
commit 7fad87cf45
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/yugecin/opsudance/ui/OptionsOverlay.java
View File

@ -103,6 +103,7 @@ public class OptionsOverlay implements ResolutionChangedListener {
private int sliderOptionStartX; private int sliderOptionStartX;
private int sliderOptionLength; private int sliderOptionLength;
private boolean isAdjustingSlider; private boolean isAdjustingSlider;
private int unchangedSliderValue;
private final HashMap<ListOption, DropdownMenu<Object>> dropdownMenus; private final HashMap<ListOption, DropdownMenu<Object>> dropdownMenus;
private final LinkedList<DropdownMenu<Object>> visibleDropdownMenus; private final LinkedList<DropdownMenu<Object>> visibleDropdownMenus;
@ -283,7 +284,7 @@ public class OptionsOverlay implements ResolutionChangedListener {
} }
public void render(Graphics g) { public void render(Graphics g) {
if (!this.active && this.currentWidth == 0) { if (!this.active && this.currentWidth == this.navButtonSize) {
return; return;
} }
@ -653,7 +654,7 @@ public class OptionsOverlay implements ResolutionChangedListener {
} }
public void preRenderUpdate() { public void preRenderUpdate() {
if (!this.active && this.currentWidth == 0) { if (!this.active && this.currentWidth == this.navButtonSize) {
return; return;
} }
@ -818,6 +819,7 @@ public class OptionsOverlay implements ResolutionChangedListener {
if (hoverOption != null && hoverOption instanceof NumericOption) { if (hoverOption != null && hoverOption instanceof NumericOption) {
isAdjustingSlider = sliderOptionStartX <= x && x < sliderOptionStartX + sliderOptionLength; isAdjustingSlider = sliderOptionStartX <= x && x < sliderOptionStartX + sliderOptionLength;
if (isAdjustingSlider) { if (isAdjustingSlider) {
unchangedSliderValue = ((NumericOption) hoverOption).val;
updateSliderOption(); updateSliderOption();
} }
} }
@ -960,6 +962,11 @@ public class OptionsOverlay implements ResolutionChangedListener {
} }
if (key == Keyboard.KEY_ESCAPE) { if (key == Keyboard.KEY_ESCAPE) {
if (isAdjustingSlider) {
isAdjustingSlider = false;
((NumericOption) hoverOption).setValue(unchangedSliderValue);
//updateHoverOption(mouseX, mouseY);
}
if (openDropdownMenu != null) { if (openDropdownMenu != null) {
openDropdownMenu.keyPressed(key, c); openDropdownMenu.keyPressed(key, c);
return true; return true;