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

Merge pull request #49 from Helloman892/master

Browse Source 
Resolving #35 as best as possible
This commit is contained in:
Helloman892
2017-09-04 22:50:06 +01:00
committed by GitHub
parent e03d150840 a38508c30f
commit 3d17509229
3 changed files with 10 additions and 8 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);

14
source/draw.c
View File

@@ -148,13 +148,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;
@@ -162,7 +162,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)
@@ -209,6 +209,8 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
pp2d_draw_wtext(130, 120, 0.6, 0.6, COLOR_WHITE, L"\uE005 Scan QRCode"); pp2d_draw_wtext(130, 120, 0.6, 0.6, COLOR_WHITE, L"\uE005 Scan QRCode");
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++) {
@@ -269,10 +271,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;

2
source/main.c
View File

@@ -107,7 +107,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);
} }