sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Use unsigned int for UI component count

scene_man
En Yi 2023-11-11 12:30:42 +08:00
parent ffc890240b
commit 97714eccf6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scenes/menu_scene.c
View File

@ -35,7 +35,7 @@ static void exec_component_function(Scene_t* scene, int sel)
static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed) static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed)
{ {
MenuSceneData_t* data = &(CONTAINER_OF(scene, MenuScene_t, scene)->data); MenuSceneData_t* data = &(CONTAINER_OF(scene, MenuScene_t, scene)->data);
int new_selection = data->selected_comp; unsigned int new_selection = data->selected_comp;
if (!pressed) if (!pressed)
{ {
if (data->mode == MOUSE_MODE) if (data->mode == MOUSE_MODE)
@ -47,10 +47,21 @@ static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed)
switch(action) switch(action)
{ {
case ACTION_UP: case ACTION_UP:
new_selection--; if (new_selection == 0)
{
new_selection = data->max_comp - 1;
}
else
{
new_selection--;
}
break; break;
case ACTION_DOWN: case ACTION_DOWN:
new_selection++; new_selection++;
if (new_selection == data->max_comp)
{
new_selection = 0;
}
break; break;
case ACTION_LEFT: case ACTION_LEFT:
break; break;
@ -61,9 +72,7 @@ static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed)
} }
} }
data->buttons[data->selected_comp].state = STATE_NORMAL; data->buttons[data->selected_comp].state = STATE_NORMAL;
if (new_selection < 0) new_selection = data->max_comp - 1; printf("new: %u, old %u\n", new_selection, data->selected_comp);
if (new_selection >= data->max_comp) new_selection = 0;
printf("new: %d, old %d\n", new_selection, data->selected_comp);
data->buttons[new_selection].state = STATE_FOCUSED; data->buttons[new_selection].state = STATE_FOCUSED;
data->selected_comp = new_selection; data->selected_comp = new_selection;

4
scenes/scene_impl.h
View File

@ -75,8 +75,8 @@ typedef enum GuiMode {
typedef struct MenuSceneData { typedef struct MenuSceneData {
UIComp_t buttons[4]; UIComp_t buttons[4];
int selected_comp; unsigned int selected_comp;
int max_comp; unsigned int max_comp;
GuiMode_t mode; GuiMode_t mode;
} MenuSceneData_t; } MenuSceneData_t;