Skip to content

Commit 457a824

Browse files
authored
Make X clear string in keyboard (#226)
1 parent a727ca4 commit 457a824

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

arm9/source/keyboard.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ std::string kbdGetString(std::string label, int maxSize, std::string oldStr) {
5959
}
6060
font->printf(2 + cursorPosition, labelHeight, false, Alignment::left, Palette::blackWhite, "%s", stringPosition < (int)output.size() ? output.substr(stringPosition, charLen).c_str() : " ");
6161

62-
font->print(firstCol, labelHeight + 2, false, STR_START_RETURN_B_BACKSPACE, alignStart);
62+
font->print(firstCol, labelHeight + 2, false, STR_START_RETURN_B_BACKSPACE_X_CLEAR, alignStart);
6363
font->update(false);
6464

6565
do {
6666
scanKeys();
6767
pressed = keysDownRepeat();
6868
key = keyboardUpdate();
6969
swiWaitForVBlank();
70-
} while (!((pressed & (KEY_LEFT | KEY_RIGHT | KEY_B | KEY_START | KEY_TOUCH)) || (key != -1)));
70+
} while (!((pressed & (KEY_LEFT | KEY_RIGHT | KEY_B | KEY_X | KEY_START | KEY_TOUCH)) || (key != -1)));
7171

7272
switch(key) {
7373
case NOKEY:
@@ -176,6 +176,10 @@ std::string kbdGetString(std::string label, int maxSize, std::string oldStr) {
176176
scrollPosition--;
177177
}
178178
}
179+
} else if(pressed & KEY_X) {
180+
output = "";
181+
stringPosition = 0;
182+
scrollPosition = 0;
179183
} else if(pressed & KEY_START) {
180184
done = true;
181185
}

arm9/source/language.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ STRING(A_SELECT_B_CANCEL, "(\\A select, \\B cancel)")
189189
STRING(START_CANCEL, "(START cancel)")
190190
STRING(UDLR_CHANGE_ATTRIBUTES, "(\\D change attributes)")
191191
STRING(A_APPLY_B_CANCEL, "(\\A apply, \\B cancel)")
192-
STRING(START_RETURN_B_BACKSPACE, "(START Return, \\B Backspace)")
192+
STRING(START_RETURN_B_BACKSPACE_X_CLEAR, "(START Return, \\B Backspace, \\X Clear)")
193193

194194
// Byte counts
195195
STRING(1_BYTE, "1 Byte")

0 commit comments

Comments
 (0)