From 78bdb0d7384cafee38535659b4ef0ae4e4c167fd Mon Sep 17 00:00:00 2001 From: Nic <33672161+Wizzrobes@users.noreply.github.com> Date: Fri, 8 Dec 2017 13:01:01 -0600 Subject: [PATCH] Proposed enhancement to Issue #94 on the select button "minus" (#104) * Added select graphic and code to replace minus * Actually added the select PNG to romfs --- include/common.h | 3 ++- romfs/select.png | Bin 0 -> 1715 bytes source/draw.c | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 romfs/select.png diff --git a/include/common.h b/include/common.h index 0e47d7e..24a6222 100644 --- a/include/common.h +++ b/include/common.h @@ -63,10 +63,11 @@ enum TextureID { TEXTURE_BATTERY_CHARGE, TEXTURE_QR, TEXTURE_PREVIEW, + TEXTURE_SELECT_BUTTON, //Add the new select texture TEXTURE_ICON, // always the last }; void exit_function(void); -#endif \ No newline at end of file +#endif diff --git a/romfs/select.png b/romfs/select.png new file mode 100644 index 0000000000000000000000000000000000000000..e0439ba6d96ecb94395f2b6778547dbc12eee1e8 GIT binary patch literal 1715 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-m!3HFmMfUFmQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#ArFhFC68OqQpxRiVy4yhf z7Kl4vym-L{GY3Wk#b1Ebf*ruc#T5=@AG?12IyWN_u&}V~07(KBPX+NofSH-O10;qH z(AE6<^~(^bycp<-0HDWIfby>e1qG$Sh5!j5|15~j#KZ(j%M2_a0_d9aKns#IG&DW| z4cN)X#&#YgP7VN?;|{c>7ih*+sQw;&=72+hm6i4Qj~_q$fC`@hecuiY!g!D-phL5P zhJgW4EC!oFSky2A)e)Vu;E50z4bKiAKD-oY+d813W+2OeY~(0dg3STwYJd*i3DjQ# z3`y+|A3g{G`6WMp{#3=L7c2(y9!L?021dniP;>w_>!2qvpm+}!u_YjVFaS~mG8AZD zJdk|{h~EKm*Q!;k;2s6?&%hi5%7!3c5*=JHjntwCML7V@1<#&68?aEA!|SK@d$spL PP^fyk`njxgN@xNA`?_~v literal 0 HcmV?d00001 diff --git a/source/draw.c b/source/draw.c index af08407..81375f0 100644 --- a/source/draw.c +++ b/source/draw.c @@ -56,6 +56,7 @@ void init_screens(void) pp2d_load_texture_png(TEXTURE_BATTERY_4, "romfs:/battery4.png"); pp2d_load_texture_png(TEXTURE_BATTERY_5, "romfs:/battery5.png"); pp2d_load_texture_png(TEXTURE_BATTERY_CHARGE, "romfs:/charging.png"); + pp2d_load_texture_png(TEXTURE_SELECT_BUTTON, "romfs:/select.png"); //Load new select PNG } void exit_screens(void) @@ -108,7 +109,7 @@ void throw_error(char* error, ErrorLevel level) if(kDown & KEY_A) exit_function(); } break; - case ERROR_LEVEL_WARNING: + case ERROR_LEVEL_WARNING: while(aptMainLoop()) { hidScanInput(); @@ -134,7 +135,7 @@ void draw_preview(int preview_offset) void draw_install(InstallType type) { draw_base_interface(); - switch(type) + switch(type) { case INSTALL_SINGLE: pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing a single theme..."); @@ -216,7 +217,8 @@ void draw_interface(Entry_List_s* list, EntryMode current_mode) pp2d_draw_wtext(BUTTONS_X_RIGHT, BUTTONS_Y_LINE_2, 0.6, 0.6, COLOR_WHITE, L"\uE001 Queue Shuffle"); pp2d_draw_wtext(BUTTONS_X_LEFT, BUTTONS_Y_LINE_3, 0.6, 0.6, COLOR_WHITE, L"\uE002 Install BGM"); - pp2d_draw_wtext(BUTTONS_X_RIGHT, BUTTONS_Y_LINE_3, 0.6, 0.6, COLOR_WHITE, L"\uE046 Install Shuffle Themes"); + pp2d_draw_texture(TEXTURE_SELECT_BUTTON, BUTTONS_X_RIGHT -38, BUTTONS_Y_LINE_3 + 3); //Draw select in place of old minus + pp2d_draw_wtext(BUTTONS_X_RIGHT, BUTTONS_Y_LINE_3, 0.6, 0.6, COLOR_WHITE, L"Install Shuffle Themes"); break; case MODE_SPLASHES: pp2d_draw_text_center(GFX_TOP, BUTTONS_Y_PREVIEW, 0.6, 0.6, COLOR_WHITE, "\uE003 Preview Splash"); @@ -291,4 +293,3 @@ void draw_interface(Entry_List_s* list, EntryMode current_mode) pp2d_draw_texture_blend(TEXTURE_SHUFFLE, 280, 32 + vertical_offset, font_color); } } -