YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed un-needed count variable.

Browse Source
This commit is contained in:
Dominic Masters
2021-09-02 10:33:11 -07:00
parent cc79313183
commit f91cc172e9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dawn/ui/menulist.h
View File

@ -26,5 +26,4 @@ typedef struct {
frame_t frame; frame_t frame;
menu_t menu; menu_t menu;
rectangle_t selection; rectangle_t selection;
uint8_t count;
} menulist_t; } menulist_t;

12
src/ui/menulist.c
View File

@ -8,11 +8,8 @@
#include "menulist.h" #include "menulist.h"
void menuListInit(menulist_t *ml, texture_t *texture) { void menuListInit(menulist_t *ml, texture_t *texture) {
uint8_t i;
ml->x = 0; ml->x = 0;
ml->y = 0; ml->y = 0;
ml->count = 0;
menuInit(&ml->menu); menuInit(&ml->menu);
@ -29,7 +26,7 @@ uint8_t menuListAdd(menulist_t *ml, font_t *font, char *text) {
menuitem_t *item; menuitem_t *item;
// Get the variables. // Get the variables.
i = ml->count; i = ml->menu.itemCount;
label = ml->labels + i; label = ml->labels + i;
ml->items[i] = text; ml->items[i] = text;
@ -50,8 +47,7 @@ uint8_t menuListAdd(menulist_t *ml, font_t *font, char *text) {
item->height = 1; item->height = 1;
item->x = 0; item->x = 0;
item->y = i; item->y = i;
ml->count++;
return i; return i;
} }
@ -81,7 +77,7 @@ void menuListRender(menulist_t *ml, shader_t *shader) {
rectangleRender(&ml->selection, shader); rectangleRender(&ml->selection, shader);
// Render each label. // Render each label.
for(i = 0; i < ml->count; i++) { for(i = 0; i < ml->menu.itemCount; i++) {
label = ml->labels + i; label = ml->labels + i;
label->x = FRAME_BORDER_SIZE; label->x = FRAME_BORDER_SIZE;
label->y = FRAME_BORDER_SIZE + i * FONT_LINE_HEIGHT * fontScale; label->y = FRAME_BORDER_SIZE + i * FONT_LINE_HEIGHT * fontScale;
@ -91,7 +87,7 @@ void menuListRender(menulist_t *ml, shader_t *shader) {
void menuListDispose(menulist_t *ml) { void menuListDispose(menulist_t *ml) {
uint8_t i; uint8_t i;
for(i = 0; i < ml->count; i++) { for(i = 0; i < ml->menu.itemCount; i++) {
labelDispose(ml->labels + i); labelDispose(ml->labels + i);
} }