ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

see #35

Browse Source 
percentage bar isn't practical.
counter was quite simple.
This commit is contained in:
Helloman892
2017-09-04 22:41:26 +01:00
parent d3a8f79958
commit 0ddb35d3d7
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/draw.h
View File

@@ -37,7 +37,7 @@ void exit_screens(void);
void draw_base_interface(void); void draw_base_interface(void);
void draw_qr(void); void draw_qr(void);
void draw_theme_install(int install_type); void draw_theme_install(int install_type);
void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode); void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode, int shuffle_theme_count);
void draw_splash_install(int install_type); void draw_splash_install(int install_type);
void draw_splash_interface(Splash_s *splashes_list, int splash_count, int selected_splash, bool preview_mode); void draw_splash_interface(Splash_s *splashes_list, int splash_count, int selected_splash, bool preview_mode);

16
source/draw.c
View File

@@ -117,7 +117,7 @@ void draw_qr(void)
void draw_shuffle_selection(int shuffled_theme_count) void draw_shuffle_selection(int shuffled_theme_count)
{ {
pp2d_draw_text(36, 2, 0.6, 0.6, COLOR_WHITE, "%d/10", shuffled_theme_count); pp2d_draw_textf(36, 2, 0.6, 0.6, COLOR_WHITE, "%i/10", shuffled_theme_count);
} }
void draw_base_interface(void) void draw_base_interface(void)
@@ -153,13 +153,13 @@ void draw_theme_install(int install_type)
switch(install_type) switch(install_type)
{ {
case 0: case 0:
pp2d_draw_text(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing a single theme..."); pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_WHITE, "Installing a single theme...");
break; break;
case 1: case 1:
pp2d_draw_text(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing a shuffle theme..."); pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_WHITE, "Installing a shuffle theme...");
break; break;
case 2: case 2:
pp2d_draw_text(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing BGM..."); pp2d_draw_text(120, 120, 0.8, 0.8, COLOR_WHITE, "Installing BGM...");
break; break;
default: default:
break; break;
@@ -167,7 +167,7 @@ void draw_theme_install(int install_type)
pp2d_end_draw(); pp2d_end_draw();
} }
void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode) void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode, int shuffle_theme_count)
{ {
if (themes_list == NULL) if (themes_list == NULL)
@@ -214,6 +214,8 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
pp2d_draw_on(GFX_BOTTOM); pp2d_draw_on(GFX_BOTTOM);
pp2d_draw_textf(7, 3, 0.6, 0.6, COLOR_WHITE, "Selected: %i/10", shuffle_theme_count);
// Scroll the menu up or down if the selected theme is out of its bounds // Scroll the menu up or down if the selected theme is out of its bounds
//---------------------------------------------------------------- //----------------------------------------------------------------
for (int i = 0; i < theme_count; i++) { for (int i = 0; i < theme_count; i++) {
@@ -274,10 +276,10 @@ void draw_splash_install(int install_type)
switch (install_type) switch (install_type)
{ {
case SINGLE_INSTALL: case SINGLE_INSTALL:
pp2d_draw_textf(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing a splash..."); pp2d_draw_textf(130, 110, 0.7, 0.7, COLOR_WHITE, "Installing a splash...");
break; break;
case UNINSTALL: case UNINSTALL:
pp2d_draw_textf(20, 30, 0.7, 0.7, COLOR_WHITE, "Uninstalling a splash..."); pp2d_draw_textf(130, 110, 0.7, 0.7, COLOR_WHITE, "Uninstalling a splash...");
break; break;
default: default:
break; break;

3
source/main.c
View File

@@ -106,7 +106,7 @@ int main(void)
draw_qr(); draw_qr();
} else if (!splash_mode) } else if (!splash_mode)
{ {
draw_theme_interface(themes_list, theme_count, selected_theme, preview_mode); draw_theme_interface(themes_list, theme_count, selected_theme, preview_mode, shuffle_theme_count);
} else { } else {
draw_splash_interface(splashes_list, splash_count, selected_splash, preview_mode); draw_splash_interface(splashes_list, splash_count, selected_splash, preview_mode);
} }
@@ -199,7 +199,6 @@ int main(void)
current_theme->in_shuffle = false; current_theme->in_shuffle = false;
} }
} }
draw_shuffle_selection(shuffle_theme_count);
} }
} }