Merge pull request #119 from savaughn/release-v0.10.1

hotfix v0.10.1: added drag/drop offset display on evolve screen
savaughn · Dec 1, 2023 · 31fa341 · 31fa341
2 parents 5980deb + 7ac974d
commit 31fa341
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ PLATFORM              ?= PLATFORM_DESKTOP
 
 # Define project variables
 PROJECT_NAME          ?= pokeromtrader
-PROJECT_VERSION       := 0.10.0
+PROJECT_VERSION       := 0.10.1
 # prerelease or release
 PROJECT_VERSION_TYPE  ?= release
 PROJECT_BUILD_PATH    ?= .

diff --git a/src/screens/SingleFileSelectScreen.c b/src/screens/SingleFileSelectScreen.c
@@ -60,14 +60,8 @@ void draw_file_select_single(struct save_file_data *save_file_data, PokemonSave
         load_display_files(save_file_data, pkmn_saves, &save_file_count);
 
         // Update and draw save files
-        for (int i = 0; i < save_file_data->num_saves + 1; i++)
+        for (int i = 0; i < save_file_data->num_saves; i++)
         {
-            if (i == save_file_data->num_saves)
-            {
-                // Draw drag and drop container
-                draw_drag_drop_container((Rectangle){SCREEN_WIDTH / 2 - (SCREEN_WIDTH - 50) / 2, y_offset + (93 * i) - (60 * corrupted_count), SCREEN_WIDTH - 50, 80});
-                break;
-            }
             bool is_corrupted = pkmn_saves[i].save_generation_type == SAVE_GENERATION_CORRUPTED;
             const Rectangle save_file_rec = (Rectangle){SCREEN_WIDTH / 2 - (SCREEN_WIDTH - 50) / 2, y_offset + (93 * i) - (60 * corrupted_count), SCREEN_WIDTH - 50, 80};
 
@@ -117,7 +111,10 @@ void draw_file_select_single(struct save_file_data *save_file_data, PokemonSave
             }
         }
 
-        handle_list_scroll(&y_offset, save_file_data->num_saves, corrupted_count, &mouses_down_index, &is_moving_scroll, &banner_position_offset);
+        // Draw drag and drop container
+        draw_drag_drop_container((Rectangle){SCREEN_WIDTH / 2 - (SCREEN_WIDTH - 50) / 2, y_offset + (93 * save_file_data->num_saves) - (60 * corrupted_count), SCREEN_WIDTH - 50, 80});
+
+        handle_list_scroll(&y_offset, save_file_data->num_saves + 1, corrupted_count, &mouses_down_index, &is_moving_scroll, &banner_position_offset);
     }
 
     // Top Banner