fix not being able to enter O in the search bar in songmenu

This commit is contained in:
yugecin 2017-01-21 13:17:22 +01:00
parent dd731592aa
commit 4dc8b34557

View File

@ -1171,28 +1171,25 @@ public class SongMenu extends ComplexOpsuState {
case Input.KEY_PRIOR: case Input.KEY_PRIOR:
changeIndex(-MAX_SONG_BUTTONS); changeIndex(-MAX_SONG_BUTTONS);
return true; return true;
case Input.KEY_O: }
if (input.isKeyDown(Input.KEY_LCONTROL) || input.isKeyDown(Input.KEY_RCONTROL)) { if (key == Input.KEY_O && (input.isKeyDown(Input.KEY_LCONTROL) || input.isKeyDown(Input.KEY_RCONTROL))) {
optionsOverlay.show(); optionsOverlay.show();
}
return true; return true;
default: }
// wait for user to finish typing // wait for user to finish typing
// TODO: accept all characters (current conditions are from TextField class) // TODO: accept all characters (current conditions are from TextField class)
if ((c > 31 && c < 127) || key == Input.KEY_BACK) { if ((c > 31 && c < 127) || key == Input.KEY_BACK) {
searchTimer = 0; searchTimer = 0;
searchTextField.keyPressed(key, c); searchTextField.keyPressed(key, c);
int textLength = searchTextField.getText().length(); int textLength = searchTextField.getText().length();
if (lastSearchTextLength != textLength) { if (lastSearchTextLength != textLength) {
if (key == Input.KEY_BACK) { if (key == Input.KEY_BACK) {
if (textLength == 0) if (textLength == 0)
searchTransitionTimer = 0;
} else if (textLength == 1)
searchTransitionTimer = 0; searchTransitionTimer = 0;
lastSearchTextLength = textLength; } else if (textLength == 1)
} searchTransitionTimer = 0;
lastSearchTextLength = textLength;
} }
return true;
} }
return true; return true;
} }