Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix displaying alphabet preview in input tool

Browse Source
This commit is contained in:
d0k3 2019-06-02 11:02:53 +02:00
parent b45bb966df
commit ae5584aca0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arm9/source/common/ui.c
View File

@ -722,6 +722,7 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
const u32 alphabet_size = strnlen(alphabet, 256); const u32 alphabet_size = strnlen(alphabet, 256);
const u32 input_shown = 22; const u32 input_shown = 22;
const u32 fast_scroll = 4; const u32 fast_scroll = 4;
const u64 aprv_delay = 128;
u32 str_width, str_height; u32 str_width, str_height;
u32 x, y; u32 x, y;
@ -747,10 +748,13 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
DrawStringF(MAIN_SCREEN, x + 8, y + str_height - 40, COLOR_STD_FONT, COLOR_STD_BG, DrawStringF(MAIN_SCREEN, x + 8, y + str_height - 40, COLOR_STD_FONT, COLOR_STD_BG,
"R - (\x18\x19) fast scroll\nL - clear data%s", resize ? "\nX - remove char\nY - insert char" : ""); "R - (\x18\x19) fast scroll\nL - clear data%s", resize ? "\nX - remove char\nY - insert char" : "");
// wait for all keys released
while (HID_ReadState() & BUTTON_ANY);
int cursor_a = -1; int cursor_a = -1;
u32 cursor_s = 0; u32 cursor_s = 0;
u32 scroll = 0; u32 scroll = 0;
bool aprv = false; u64 aprv = 0;
bool ret = false; bool ret = false;
while (true) { while (true) {
@ -781,7 +785,7 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
// alphabet preview // alphabet preview
if (alphabet_size > (SCREEN_WIDTH(MAIN_SCREEN) / font_width)) { if (alphabet_size > (SCREEN_WIDTH(MAIN_SCREEN) / font_width)) {
const u32 aprv_y = y + str_height - 60; const u32 aprv_y = y + str_height - 60;
if (aprv) { if (timer_msec(aprv) < aprv_delay) {
const u32 aprv_pad = 1; const u32 aprv_pad = 1;
const u32 aprv_cx = x + ((1 + cursor_s - scroll) * font_width); const u32 aprv_cx = x + ((1 + cursor_s - scroll) * font_width);
u32 aprv_x = aprv_cx % (font_width + aprv_pad); u32 aprv_x = aprv_cx % (font_width + aprv_pad);
@ -798,7 +802,7 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
} }
u32 pad_state = InputWait(3); u32 pad_state = InputWait(3);
aprv = (pad_state & (BUTTON_UP|BUTTON_DOWN|BUTTON_R1)) && !(pad_state & (BUTTON_RIGHT|BUTTON_LEFT)); if (pad_state & (BUTTON_UP|BUTTON_DOWN|BUTTON_R1)) aprv = timer_start();
if (pad_state & BUTTON_A) { if (pad_state & BUTTON_A) {
ret = true; ret = true;
break; break;