mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled get-lang for now (see comment), and decreased x-pos by 32 for buttons/buttons-text (for longer strings).

Browse Source
This commit is contained in:
yellows8 2018-02-27 15:08:11 -05:00
parent 0cb9f3961f
commit c6fe507e82
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/menu.c
View File

@ -301,12 +301,12 @@ void drawTime() {
} }
void drawBackBtn(menu_s* menu, bool emptyDir) { void drawBackBtn(menu_s* menu, bool emptyDir) {
int x_image = 1280 - 252 - 30; int x_image = 1280 - 252 - 30 - 32;
int x_text = 1280 - 216 - 30; int x_text = 1280 - 216 - 30 - 32;
if(emptyDir) { if(emptyDir) {
x_image = 1280 - 126 - 30; x_image = 1280 - 126 - 30 - 32;
x_text = 1280 - 90 - 30; x_text = 1280 - 90 - 30 - 32;
} }
#ifdef SWITCH #ifdef SWITCH
@ -396,12 +396,12 @@ void menuLoop() {
if(active_entry != NULL) { if(active_entry != NULL) {
if (active_entry->type != ENTRY_TYPE_FOLDER) { if (active_entry->type != ENTRY_TYPE_FOLDER) {
drawImage(1280 - 126 - 30, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32); drawImage(1280 - 126 - 30 - 32, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32);
DrawText(interuiregular18, 1280 - 90 - 30, 720 - 47, themeCurrent.textColor, textGetString(StrId_Actions_Launch)); DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47, themeCurrent.textColor, textGetString(StrId_Actions_Launch));
} }
else { else {
drawImage(1280 - 126 - 30, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32); drawImage(1280 - 126 - 30 - 32, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32);
DrawText(interuiregular18, 1280 - 90 - 30, 720 - 47, themeCurrent.textColor, textGetString(StrId_Actions_Open)); DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47, themeCurrent.textColor, textGetString(StrId_Actions_Open));
} }
} }

10
common/text.c
View File

@ -8,14 +8,16 @@ static int s_textLang = 1;
void textInit(void) { void textInit(void) {
#ifdef SWITCH #ifdef SWITCH
u64 LanguageCode=0; //u64 LanguageCode=0;
s32 Language=0; //s32 Language=0;
Result rc = setInitialize();
s_textLang = SetLanguage_ENUS; s_textLang = SetLanguage_ENUS;
//TODO: Re-enable this once the font supports all used languages.
/*Result rc = setInitialize();
if (R_SUCCEEDED(rc)) rc = setGetSystemLanguage(&LanguageCode); if (R_SUCCEEDED(rc)) rc = setGetSystemLanguage(&LanguageCode);
if (R_SUCCEEDED(rc)) rc = setMakeLanguage(LanguageCode, &Language); if (R_SUCCEEDED(rc)) rc = setMakeLanguage(LanguageCode, &Language);
if (R_SUCCEEDED(rc) && Language < 16) s_textLang = Language; if (R_SUCCEEDED(rc) && Language < 16) s_textLang = Language;
setExit(); setExit();*/
#else #else
s_textLang = 1; s_textLang = 1;
#endif #endif