joel16/VitaShell
1
0
Fork 0
mirror of https://github.com/joel16/VitaShell.git synced 2024-12-03 17:30:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved list dialog

Browse Source
This commit is contained in:
TheFloW 2016-09-20 15:40:16 +02:00
parent d788590b29
commit 89bf570c07
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
list_dialog.c
View File

@ -71,10 +71,11 @@ void loadListDialog(List* list) {
list_dialog.height += 4.0f * SHELL_MARGIN_Y; list_dialog.height += 4.0f * SHELL_MARGIN_Y;
list_dialog.x = CENTER(SCREEN_WIDTH, list_dialog.width); list_dialog.x = CENTER(SCREEN_WIDTH, list_dialog.width);
list_dialog.y = CENTER(SCREEN_HEIGHT, list_dialog.height); list_dialog.y = CENTER(SCREEN_HEIGHT, list_dialog.height) - 2.0f * FONT_Y_SPACE;
list_dialog.scale = 0.0f; list_dialog.scale = 0.0f;
list_dialog.animation_mode = LIST_DIALOG_OPENING; list_dialog.animation_mode = LIST_DIALOG_OPENING;
list_dialog.status = SCE_COMMON_DIALOG_STATUS_RUNNING; list_dialog.status = SCE_COMMON_DIALOG_STATUS_RUNNING;
list_dialog.enter_pressed = 0;
is_open = LIST_DIALOG_OPEN; is_open = LIST_DIALOG_OPEN;
} }
@ -131,6 +132,11 @@ void drawListDialog() {
pgf_draw_text(list_dialog.x + CENTER(list_dialog.width, vita2d_pgf_text_width(font, FONT_SIZE, UP_ARROW)), list_dialog.y + (FONT_Y_SPACE * 2), TEXT_COLOR, FONT_SIZE, UP_ARROW); pgf_draw_text(list_dialog.x + CENTER(list_dialog.width, vita2d_pgf_text_width(font, FONT_SIZE, UP_ARROW)), list_dialog.y + (FONT_Y_SPACE * 2), TEXT_COLOR, FONT_SIZE, UP_ARROW);
} }
} else if (list_dialog.animation_mode == LIST_DIALOG_CLOSED) { } else if (list_dialog.animation_mode == LIST_DIALOG_CLOSED) {
if (list_dialog.enter_pressed) {
if (current_list->listSelectCallback)
current_list->listSelectCallback(base_pos + rel_pos);
}
is_open = LIST_DIALOG_CLOSE; is_open = LIST_DIALOG_CLOSE;
} }
} }
@ -139,13 +145,12 @@ void listDialogCtrl() {
if (is_open == LIST_DIALOG_CLOSE) if (is_open == LIST_DIALOG_CLOSE)
return; return;
if (pressed_buttons & SCE_CTRL_CANCEL && current_list->can_escape) if ((pressed_buttons & (SCE_CTRL_CANCEL | SCE_CTRL_START)) && current_list->can_escape)
list_dialog.animation_mode = LIST_DIALOG_CLOSING; list_dialog.animation_mode = LIST_DIALOG_CLOSING;
if (pressed_buttons & SCE_CTRL_CROSS) { if (pressed_buttons & SCE_CTRL_CROSS) {
if (current_list->listSelectCallback) list_dialog.enter_pressed = 1;
if (current_list->listSelectCallback(base_pos + rel_pos) == LIST_CALL_CLOSE) list_dialog.animation_mode = LIST_DIALOG_CLOSING;
list_dialog.animation_mode = LIST_DIALOG_CLOSING;
} }
if (hold_buttons & SCE_CTRL_UP || hold2_buttons & SCE_CTRL_LEFT_ANALOG_UP) { if (hold_buttons & SCE_CTRL_UP || hold2_buttons & SCE_CTRL_LEFT_ANALOG_UP) {

1
list_dialog.h
View File

@ -27,6 +27,7 @@
typedef struct typedef struct
{ {
int enter_pressed;
int animation_mode; int animation_mode;
int status; int status;
float x; float x;