diff --git a/src/itdelatrisu/opsu/states/DownloadsMenu.java b/src/itdelatrisu/opsu/states/DownloadsMenu.java index 0c507690..b783b300 100644 --- a/src/itdelatrisu/opsu/states/DownloadsMenu.java +++ b/src/itdelatrisu/opsu/states/DownloadsMenu.java @@ -537,7 +537,7 @@ public class DownloadsMenu extends ComplexOpsuState { } importThread = null; } - backButton.hoverUpdate(delta, mouseX, mouseY); + backButton.hoverUpdate(); prevPage.hoverUpdate(delta, mouseX, mouseY); nextPage.hoverUpdate(delta, mouseX, mouseY); clearButton.hoverUpdate(delta, mouseX, mouseY); diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index 4718183a..8162cf6d 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -717,6 +717,9 @@ public class Game extends ComplexOpsuState { if (OPTION_DANCE_ENABLE_SB.state) { optionsOverlay.render(g); + if (optionsOverlay.isActive()) { + backButton.draw(g); + } } UI.draw(g); @@ -728,6 +731,9 @@ public class Game extends ComplexOpsuState { if (OPTION_DANCE_ENABLE_SB.state) { optionsOverlay.preRenderUpdate(); + if (optionsOverlay.isActive()) { + backButton.hoverUpdate(); + } } int delta = renderDelta; diff --git a/src/itdelatrisu/opsu/states/GameRanking.java b/src/itdelatrisu/opsu/states/GameRanking.java index e95979f9..29bd9d3e 100644 --- a/src/itdelatrisu/opsu/states/GameRanking.java +++ b/src/itdelatrisu/opsu/states/GameRanking.java @@ -107,7 +107,7 @@ public class GameRanking extends BaseOpsuState { } else { MusicController.loopTrackIfEnded(true); } - backButton.hoverUpdate(delta, mouseX, mouseY); + backButton.hoverUpdate(); } @Override diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java index 79bfff5a..de8ff877 100644 --- a/src/itdelatrisu/opsu/states/MainMenu.java +++ b/src/itdelatrisu/opsu/states/MainMenu.java @@ -481,6 +481,9 @@ public class MainMenu extends BaseOpsuState { @Override public void preRenderUpdate() { optionsOverlay.preRenderUpdate(); + if (optionsOverlay.isActive()) { + backButton.hoverUpdate(); + } int delta = renderDelta; diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java index 98fcc161..5947e4d0 100644 --- a/src/itdelatrisu/opsu/states/SongMenu.java +++ b/src/itdelatrisu/opsu/states/SongMenu.java @@ -689,10 +689,10 @@ public class SongMenu extends ComplexOpsuState { UI.drawLoadingProgress(g); } else { + optionsOverlay.render(g); backButton.draw(g); } - optionsOverlay.render(g); UI.draw(g); @@ -729,7 +729,7 @@ public class SongMenu extends ComplexOpsuState { MusicController.playThemeSong(config.themeBeatmap); reloadThread = null; } - backButton.hoverUpdate(delta, mouseX, mouseY); + backButton.hoverUpdate(); selectModsButton.hoverUpdate(delta, mouseX, mouseY); selectRandomButton.hoverUpdate(delta, mouseX, mouseY); selectMapOptionsButton.hoverUpdate(delta, mouseX, mouseY); diff --git a/src/yugecin/opsudance/ui/BackButton.java b/src/yugecin/opsudance/ui/BackButton.java index 5a9f0367..fdb36fa2 100644 --- a/src/yugecin/opsudance/ui/BackButton.java +++ b/src/yugecin/opsudance/ui/BackButton.java @@ -172,11 +172,11 @@ public class BackButton { /** * Processes a hover action depending on whether or not the cursor * is hovering over the button. - * @param delta the delta interval - * @param cx the x coordinate - * @param cy the y coordinate */ - public void hoverUpdate(int delta, int cx, int cy) { + public void hoverUpdate() { + final int delta = renderDelta; + final int cx = mouseX; + final int cy = mouseY; if (backButton != null) { backButton.hoverUpdate(delta, cx, cy); return; diff --git a/src/yugecin/opsudance/ui/OptionsOverlay.java b/src/yugecin/opsudance/ui/OptionsOverlay.java index 5aaadae2..4a92e06c 100644 --- a/src/yugecin/opsudance/ui/OptionsOverlay.java +++ b/src/yugecin/opsudance/ui/OptionsOverlay.java @@ -702,7 +702,6 @@ public class OptionsOverlay implements ResolutionChangedListener { prevMouseY = mouseY; updateHoverOption(mouseX, mouseY); updateIndicatorAlpha(); - backButton.hoverUpdate(delta, mouseX, mouseY); if (isAdjustingSlider) { int sliderValue = ((NumericOption) hoverOption).val; updateSliderOption();