diff options
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -6,10 +6,10 @@ #include "main.h" #include "menu.h" -#define MENU_PADDING 4 +#define PADDING 4 static int option_at(menu *m, int x, int y) { - float cur_y = MENU_PADDING; + float cur_y = PADDING; for (int i = 0; i < m->count; i++) { float tw, th; must(SDL_GetTextureSize(m->textures[i], &tw, &th)); @@ -34,18 +34,19 @@ menu *create_menu(menu_entry *entries, int count, int x, int y) { m->textures = calloc(count, sizeof(SDL_Texture *)); if (!m->textures) panic("out of memory"); - int w = MENU_PADDING, h = MENU_PADDING; + int w = PADDING, h = PADDING; for (int i = 0; i < count; i++) { SDL_Color color = {0xff, 0xff, 0xff, 0xff}; SDL_Surface *text = must(TTF_RenderText_Blended(font, m->entries[i].name, 0, color)); m->textures[i] = must(SDL_CreateTextureFromSurface(m->renderer, text)); + SDL_DestroySurface(text); float tw, th; must(SDL_GetTextureSize(m->textures[i], &tw, &th)); w = SDL_max(w, tw); h += th; } - w += MENU_PADDING; h += MENU_PADDING; + w += PADDING; h += PADDING; m->height = h; int px, py; @@ -122,7 +123,7 @@ void menu_render(menu *m) { SDL_SetRenderDrawColor(m->renderer, 0x00, 0x00, 0x00, 0xff); SDL_RenderClear(m->renderer); - float x = MENU_PADDING, y = MENU_PADDING - SDL_floor(m->scroll); + float x = PADDING, y = PADDING - SDL_floor(m->scroll); for (int i = 0; i < m->count; i++) { SDL_FRect dst; dst.x = x; |