fix back button
Make it immune to the "do not hover if options visible" hack. Make the states render it, not the options menu.
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -107,7 +107,7 @@ public class GameRanking extends BaseOpsuState {
|
||||
} else {
|
||||
MusicController.loopTrackIfEnded(true);
|
||||
}
|
||||
backButton.hoverUpdate(delta, mouseX, mouseY);
|
||||
backButton.hoverUpdate();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -481,6 +481,9 @@ public class MainMenu extends BaseOpsuState {
|
||||
@Override
|
||||
public void preRenderUpdate() {
|
||||
optionsOverlay.preRenderUpdate();
|
||||
if (optionsOverlay.isActive()) {
|
||||
backButton.hoverUpdate();
|
||||
}
|
||||
|
||||
int delta = renderDelta;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user