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

fix back button being clickthrough in option overlay

Browse Source
This commit is contained in:
yugecin
2018-10-02 22:55:52 +02:00
parent 8e272df5fc
commit 226944b658
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,6 +655,7 @@ public class OptionsOverlay implements ResolutionChangedListener, SkinChangedLis
searchField.setFocused(false); searchField.setFocused(false);
hideAnimationTime = animationtime; hideAnimationTime = animationtime;
hideAnimationStartProgress = (float) animationtime / SHOWANIMATIONTIME; hideAnimationStartProgress = (float) animationtime / SHOWANIMATIONTIME;
hoverOption = null;
} }
public void show() { public void show() {
@@ -862,6 +863,15 @@ public class OptionsOverlay implements ResolutionChangedListener, SkinChangedLis
} }
sliderOptionLength = 0; sliderOptionLength = 0;
if (backButton.contains(x, y)){
SoundController.playSound(SoundEffect.MENUBACK);
hide();
if (listener != null) {
listener.onLeaveOptionsMenu();
}
return true;
}
if (x > navWidth) { if (x > navWidth) {
if (openDropdownMenu != null) { if (openDropdownMenu != null) {
openDropdownMenu.mouseReleased(button); openDropdownMenu.mouseReleased(button);
@@ -925,14 +935,6 @@ public class OptionsOverlay implements ResolutionChangedListener, SkinChangedLis
sectionPosition = Utils.clamp(sectionPosition, (int) scrollHandler.min, (int) scrollHandler.max); sectionPosition = Utils.clamp(sectionPosition, (int) scrollHandler.min, (int) scrollHandler.max);
scrollHandler.scrollToPosition(sectionPosition); scrollHandler.scrollToPosition(sectionPosition);
} }
if (backButton.contains(x, y)){
SoundController.playSound(SoundEffect.MENUBACK);
hide();
if (listener != null) {
listener.onLeaveOptionsMenu();
}
}
return true; return true;
} }