size -> items_size

diff --git a/src/game/level_picker.c b/src/game/level_picker.c
index 4a3fe5b284122b13762ffe0905071f9eda67f289..4e2c46b308dace6d3b0aa1615b7181cd48419c60 100644 (file)
--- a/src/game/level_picker.c
+++ b/src/game/level_picker.c
@@ -79,19 +79,19 @@ int level_picker_render(const LevelPicker *level_picker,
         camera,
         vec(viewport.w * 0.5f - title_size.x * 0.5f, TITLE_MARGIN_TOP));
 
-    const float proportional_scroll = level_picker->items_scroll.y * scrolling_area_height / level_picker->size.y;
+    const float proportional_scroll = level_picker->items_scroll.y * scrolling_area_height / level_picker->items_size.y;
     const float number_of_items_in_scrolling_area = scrolling_area_height / ITEM_HEIGHT;
     const float percent_of_visible_items = number_of_items_in_scrolling_area / ((float) level_picker->items.count - 1);
 
     if(percent_of_visible_items < 1) {
         SDL_Rect scrollbar = rect_for_sdl(
             rect_from_vecs(
-                vec(level_picker->items_position.x + level_picker->size.x, level_picker->items_position.y),
+                vec(level_picker->items_position.x + level_picker->items_size.x, level_picker->items_position.y),
                 vec(SCROLLBAR_WIDTH, scrolling_area_height)));
 
         SDL_Rect scrollbar_thumb = rect_for_sdl(
             rect_from_vecs(
-                vec(level_picker->items_position.x + level_picker->size.x, level_picker->items_position.y - proportional_scroll),
+                vec(level_picker->items_position.x + level_picker->items_size.x, level_picker->items_position.y - proportional_scroll),
                 vec(SCROLLBAR_WIDTH, scrolling_area_height * percent_of_visible_items)));
 
         if (SDL_SetRenderDrawColor(camera->renderer, 255, 255, 255, 255) < 0) {
@@ -227,10 +227,10 @@ int level_picker_event(LevelPicker *level_picker,
             int width;
             SDL_GetRendererOutputSize(SDL_GetRenderer(SDL_GetWindowFromID(event->window.windowID)), &width, NULL);
             const Vec2f title_size = wiggly_text_size(&level_picker->wiggly_text);
-            level_picker->size = level_picker_list_size(level_picker);
+            level_picker->items_size = level_picker_list_size(level_picker);
 
             level_picker->items_position =
-                vec((float)width * 0.5f - level_picker->size.x * 0.5f,
+                vec((float)width * 0.5f - level_picker->items_size.x * 0.5f,
                     TITLE_MARGIN_TOP + title_size.y + TITLE_MARGIN_BOTTOM);
         } break;
         }

diff --git a/src/game/level_picker.h b/src/game/level_picker.h
index c8f632a9c6c5053940fa1f0cd76e6d354db135ff..4b58239912136358d918ead79bb1ed16f242343f 100644 (file)
--- a/src/game/level_picker.h
+++ b/src/game/level_picker.h
@@ -17,7 +17,7 @@ typedef struct {
     int selected_item;
     Vec2f items_scroll;
     Vec2f items_position;
-    Vec2f size;
+    Vec2f items_size;
 } LevelPicker;