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

songmenu: remove old button that opens options menu (ctrl+o does this)

Browse Source
This commit is contained in:
yugecin 2018-07-22 22:13:29 +02:00
parent 5a057a229e
commit ad71b5dd2e
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/selection-selectoptions-over.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
res/selection-selectoptions.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

2
src/itdelatrisu/opsu/GameImage.java
View File

@ -238,8 +238,6 @@ public enum GameImage {
SELECTION_RANDOM_OVERLAY ("selection-random-over", "png", false, false), SELECTION_RANDOM_OVERLAY ("selection-random-over", "png", false, false),
SELECTION_OPTIONS ("selection-options", "png", false, false), SELECTION_OPTIONS ("selection-options", "png", false, false),
SELECTION_OPTIONS_OVERLAY ("selection-options-over", "png", false, false), SELECTION_OPTIONS_OVERLAY ("selection-options-over", "png", false, false),
SELECTION_OTHER_OPTIONS ("selection-selectoptions", "png", false, false),
SELECTION_OTHER_OPTIONS_OVERLAY ("selection-selectoptions-over", "png", false, false),
// Replay Speed Buttons // Replay Speed Buttons
REPLAY_PLAYBACK_NORMAL ("playback-normal", "png", false, false), REPLAY_PLAYBACK_NORMAL ("playback-normal", "png", false, false),

15
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -160,7 +160,7 @@ public class SongMenu extends ComplexOpsuState {
private BeatmapSetNode hoverIndex = null; private BeatmapSetNode hoverIndex = null;
/** The selection buttons. */ /** The selection buttons. */
private MenuButton selectModsButton, selectRandomButton, selectMapOptionsButton, selectOptionsButton; private MenuButton selectModsButton, selectRandomButton, selectMapOptionsButton;
/** The search textfield. */ /** The search textfield. */
private TextField searchTextField; private TextField searchTextField;
@ -418,12 +418,9 @@ public class SongMenu extends ComplexOpsuState {
selectX + selectOffset, selectY); selectX + selectOffset, selectY);
selectMapOptionsButton = new MenuButton(GameImage.SELECTION_OPTIONS_OVERLAY.getImage(), selectMapOptionsButton = new MenuButton(GameImage.SELECTION_OPTIONS_OVERLAY.getImage(),
selectX + selectOffset * 2f, selectY); selectX + selectOffset * 2f, selectY);
selectOptionsButton = new MenuButton(GameImage.SELECTION_OTHER_OPTIONS_OVERLAY.getImage(),
selectX + selectOffset * 3f, selectY);
selectModsButton.setHoverFade(0f); selectModsButton.setHoverFade(0f);
selectRandomButton.setHoverFade(0f); selectRandomButton.setHoverFade(0f);
selectMapOptionsButton.setHoverFade(0f); selectMapOptionsButton.setHoverFade(0f);
selectOptionsButton.setHoverFade(0f);
// loader // loader
int loaderDim = GameImage.MENU_MUSICNOTE.getWidth(); int loaderDim = GameImage.MENU_MUSICNOTE.getWidth();
@ -629,8 +626,6 @@ public class SongMenu extends ComplexOpsuState {
selectRandomButton.draw(); selectRandomButton.draw();
GameImage.SELECTION_OPTIONS.getImage().drawCentered(selectMapOptionsButton.getX(), selectMapOptionsButton.getY()); GameImage.SELECTION_OPTIONS.getImage().drawCentered(selectMapOptionsButton.getX(), selectMapOptionsButton.getY());
selectMapOptionsButton.draw(); selectMapOptionsButton.draw();
GameImage.SELECTION_OTHER_OPTIONS.getImage().drawCentered(selectOptionsButton.getX(), selectOptionsButton.getY());
selectOptionsButton.draw();
// group tabs // group tabs
BeatmapGroup currentGroup = BeatmapGroup.current(); BeatmapGroup currentGroup = BeatmapGroup.current();
@ -733,7 +728,6 @@ public class SongMenu extends ComplexOpsuState {
selectModsButton.hoverUpdate(delta, mouseX, mouseY); selectModsButton.hoverUpdate(delta, mouseX, mouseY);
selectRandomButton.hoverUpdate(delta, mouseX, mouseY); selectRandomButton.hoverUpdate(delta, mouseX, mouseY);
selectMapOptionsButton.hoverUpdate(delta, mouseX, mouseY); selectMapOptionsButton.hoverUpdate(delta, mouseX, mouseY);
selectOptionsButton.hoverUpdate(delta, mouseX, mouseY);
footerLogoButton.hoverUpdate(delta, mouseX, mouseY, 0.25f); footerLogoButton.hoverUpdate(delta, mouseX, mouseY, 0.25f);
// beatmap menu timer // beatmap menu timer
@ -927,12 +921,6 @@ public class SongMenu extends ComplexOpsuState {
} else if (selectMapOptionsButton.contains(x, y)) { } else if (selectMapOptionsButton.contains(x, y)) {
this.keyPressed(KEY_F3, '\0'); this.keyPressed(KEY_F3, '\0');
return true; return true;
} else if (selectOptionsButton.contains(x, y)) {
if (!optionsOverlay.isActive()) {
SoundController.playSound(SoundEffect.MENUHIT);
optionsOverlay.show();
}
return true;
} }
// group tabs // group tabs
@ -1277,7 +1265,6 @@ public class SongMenu extends ComplexOpsuState {
selectModsButton.resetHover(); selectModsButton.resetHover();
selectRandomButton.resetHover(); selectRandomButton.resetHover();
selectMapOptionsButton.resetHover(); selectMapOptionsButton.resetHover();
selectOptionsButton.resetHover();
hoverOffset.setTime(0); hoverOffset.setTime(0);
hoverIndex = null; hoverIndex = null;
isScrollingToFocusNode = false; isScrollingToFocusNode = false;