The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-19 08:21:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix underscore bug and remove old workarounds

Browse Source
This commit is contained in:
ardi@ist-einmalig.de 2009-05-21 23:12:00 +00:00
parent fa573e22e3
commit 93aadca881
6 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/FreeTypeGX.cpp
View File

@ -625,7 +625,7 @@ uint16_t FreeTypeGX::getHeight(wchar_t const *text) {
*/
ftgxDataOffset FreeTypeGX::getOffset(wchar_t *text) {
uint16_t strLength = wcslen(text);
uint16_t strMax = 0, strMin = 0;
int16_t strMax = 0, strMin = 0;
for (uint16_t i = 0; i < strLength; i++) {

4
source/FreeTypeGX.h
View File

@ -173,8 +173,8 @@ typedef struct ftgxCharData_ {
uint16_t textureHeight; /**< Texture glyph height in pixels/bytes. */
uint16_t renderOffsetY; /**< Texture Y axis bearing offset. */
uint16_t renderOffsetMax; /**< Texture Y axis bearing maximum value. */
uint16_t renderOffsetMin; /**< Texture Y axis bearing minimum value. */
int16_t renderOffsetMax; /**< Texture Y axis bearing maximum value. */
int16_t renderOffsetMin; /**< Texture Y axis bearing minimum value. */
uint32_t* glyphDataTexture; /**< Glyph texture bitmap data buffer. */
} ftgxCharData;

7
source/libwiigui/gui_customoptionbrowser.cpp
View File

@ -342,12 +342,7 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
optionTxt[i]->SetText(options->name[next]);
optionVal[i]->SetText(options->value[next]);
char* pch;
pch=strrchr((options->value[next]),'_');
if (pch!=NULL){optionVal[i]->SetPosition(coL2, 15);}
else {optionVal[i]->SetPosition(coL2, 0);}
optionVal[i]->SetPosition(coL2, 0);
optionIndex[i] = next;
next = this->FindMenuItem(next, 1);

12
source/libwiigui/gui_gamebrowser.cpp
View File

@ -144,12 +144,6 @@ GuiGameBrowser::GuiGameBrowser(int w, int h, struct discHdr * l, int gameCnt, co
gameTxt[i] = new GuiText(buffer, 20, (GXColor){THEME.gameText_r, THEME.gameText_g, THEME.gameText_b, 0xff});
gameTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
gameTxt[i]->SetPosition(24,0);
char* pch;
pch=strrchr((buffer),'_');
if (pch!=NULL){gameTxt[i]->SetPosition(24, 15);}
else {gameTxt[i]->SetPosition(24, 0);}
gameBg[i] = new GuiImage(bgGamesEntry);
@ -366,12 +360,8 @@ void GuiGameBrowser::Update(GuiTrigger * t)
}
gameTxt[i]->SetText(buffer);
char* pch;
gameTxt[i]->SetPosition(24, 0);
pch=strrchr((buffer),'_');
if (pch!=NULL){gameTxt[i]->SetPosition(24, 15);}
else {gameTxt[i]->SetPosition(24, 0);}
gameIndex[i] = next;
next = this->FindMenuItem(next, 1);
}

10
source/libwiigui/gui_keyboard.cpp
View File

@ -202,8 +202,8 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
{'v','V','©','Ï'},
{'b','B','\0','ï'},
{'n','N','\0','Õ'},
{'m','M','\0','õ'},
{',',';','µ','ÿ'},
{'m','M','µ','õ'},
{',',';','\0','ÿ'},
{'.',':','\0','\0'},
{'-','_','\0','\0'}
}
@ -538,12 +538,8 @@ void GuiKeyboard::Update(GuiTrigger * t)
}
}
}
char* pch;
pch=strrchr(kbtextstr,'_');
if (pch!=NULL){kbText->SetPosition(0, 68);}
else {kbText->SetPosition(0, 53);}
kbText->SetPosition(0, 53);
this->ToggleFocus(t);

28
source/menu.cpp
View File

@ -288,22 +288,11 @@ static void WindowCredits(void * ptr)
txt[i] = new GuiText(LANGUAGE.For);
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(-80,y);
char* pch;
char* pch2;
pch=strrchr((LANGUAGE.For),'_');
pch2=strrchr((LANGUAGE.For),'p');
if ((pch!=NULL)||(pch2!=NULL)){txt[i]->SetPosition(-80, y+5);}
else {txt[i]->SetPosition(-80, y);}
txt[i]->SetPosition(-80, y);
i++;
txt[i] = new GuiText(LANGUAGE.For);
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(130,y);
pch=strrchr((LANGUAGE.For),'_');
pch2=strrchr((LANGUAGE.For),'p');
if ((pch!=NULL)||(pch2!=NULL)){txt[i]->SetPosition(130, y+5);}
else {txt[i]->SetPosition(130, y);}
txt[i]->SetPosition(130, y);
i++;
y+=22;
@ -313,8 +302,7 @@ static void WindowCredits(void * ptr)
i++;
txt[i] = new GuiText(LANGUAGE.For);
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); //txt[i]->SetPosition(-3,y);
if ((pch!=NULL)||(pch2!=NULL)){txt[i]->SetPosition(-3, y+5);}
else {txt[i]->SetPosition(-3, y);}
txt[i]->SetPosition(-3, y);
i++;
y+=22;
@ -323,8 +311,7 @@ static void WindowCredits(void * ptr)
i++;
txt[i] = new GuiText(LANGUAGE.For);
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(30,y);
if ((pch!=NULL)||(pch2!=NULL)){txt[i]->SetPosition(30, y+5);}
else {txt[i]->SetPosition(30, y);}
txt[i]->SetPosition(30, y);
i++;
y+=22;
@ -1308,12 +1295,7 @@ int GameWindowPrompt()
playcntTxt.SetText(PlayCnt);
btnFavoriteImg.SetImage(faveChoice ? &imgFavorite : &imgNotFavorite);
char* pch;
pch=strrchr((gameName),'_');
if (pch!=NULL){nameTxt.SetPosition(0, 16);}
else {nameTxt.SetPosition(0, 1);}
nameTxt.SetPosition(0, 1);
if(changed != 3 && changed != 4) // changed==3 or changed==4 --> only Resume the GUI
{