The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 18:31:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix underscore bug in keyboard and mp3 list.

Browse Source
This commit is contained in:
giantpune 2009-05-13 18:14:45 +00:00
parent 0a11579c18
commit 9ee6729e7f
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/libwiigui/gui_customoptionbrowser.cpp
View File

@ -16,12 +16,13 @@
#define GAMESELECTSIZE 30 #define GAMESELECTSIZE 30
static int scrollbaron = 0; static int scrollbaron = 0;
int coL2;
//int vol; //int vol;
extern const int vol; extern const int vol;
/** /**
* Constructor for the GuiCustomOptionBrowser class. * Constructor for the GuiCustomOptionBrowser class.
*/ */
GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList * l, const char *themePath, const char *custombg, const u8 *imagebg, int scrollon) GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList * l, const char *themePath, const char *custombg, const u8 *imagebg, int scrollon,int col2)
{ {
width = w; width = w;
height = h; height = h;
@ -32,6 +33,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
listOffset = this->FindMenuItem(-1, 1); listOffset = this->FindMenuItem(-1, 1);
selectedItem = 0; selectedItem = 0;
focus = 1; // allow focus focus = 1; // allow focus
coL2 = col2;
char imgPath[100]; char imgPath[100];
trigA = new GuiTrigger; trigA = new GuiTrigger;
@ -339,6 +341,13 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
optionTxt[i]->SetText(options->name[next]); optionTxt[i]->SetText(options->name[next]);
optionVal[i]->SetText(options->value[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);}
optionIndex[i] = next; optionIndex[i] = next;
next = this->FindMenuItem(next, 1); next = this->FindMenuItem(next, 1);
} }

2
source/libwiigui/gui_customoptionbrowser.h
View File

@ -32,7 +32,7 @@ class customOptionList {
class GuiCustomOptionBrowser : public GuiElement class GuiCustomOptionBrowser : public GuiElement
{ {
public: public:
GuiCustomOptionBrowser(int w, int h, customOptionList * l, const char * themePath, const char *custombg, const u8 *imagebg, int scrollbar); GuiCustomOptionBrowser(int w, int h, customOptionList * l, const char * themePath, const char *custombg, const u8 *imagebg, int scrollbar, int col2);
~GuiCustomOptionBrowser(); ~GuiCustomOptionBrowser();
void SetCol2Position(int x); void SetCol2Position(int x);
int FindMenuItem(int c, int d); int FindMenuItem(int c, int d);

8
source/libwiigui/gui_keyboard.cpp
View File

@ -9,6 +9,8 @@
***************************************************************************/ ***************************************************************************/
#include "gui.h" #include "gui.h"
#include <stdio.h>
#include <string.h>
/** /**
* Constructor for the GuiKeyboard class. * Constructor for the GuiKeyboard class.
*/ */
@ -338,6 +340,12 @@ void GuiKeyboard::Update(GuiTrigger * t)
} }
} }
} }
char* pch;
pch=strrchr(kbtextstr,'_');
if (pch!=NULL){kbText->SetPosition(0, 68);}
else {kbText->SetPosition(0, 53);}
this->ToggleFocus(t); this->ToggleFocus(t);

6
source/menu.cpp
View File

@ -3494,7 +3494,7 @@ static int MenuSettings()
btnLogo->SetUpdateCallback(WindowCredits); btnLogo->SetUpdateCallback(WindowCredits);
customOptionList options2(9); customOptionList options2(9);
GuiCustomOptionBrowser optionBrowser2(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, 0); GuiCustomOptionBrowser optionBrowser2(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, 0, 200);
optionBrowser2.SetPosition(0, 90); optionBrowser2.SetPosition(0, 90);
optionBrowser2.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser2.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser2.SetCol2Position(200); optionBrowser2.SetCol2Position(200);
@ -4224,7 +4224,7 @@ int GameSettings(struct discHdr * header)
deleteBtn.SetTrigger(&trigA); deleteBtn.SetTrigger(&trigA);
deleteBtn.SetEffectGrow(); deleteBtn.SetEffectGrow();
GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings", bg_options_settings_png, 0); GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings", bg_options_settings_png, 0, 150);
optionBrowser3.SetPosition(0, 90); optionBrowser3.SetPosition(0, 90);
optionBrowser3.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser3.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser3.SetCol2Position(150); optionBrowser3.SetCol2Position(150);
@ -4536,7 +4536,7 @@ int MenuMp3()
} else { } else {
scrollon = 1; scrollon = 1;
} }
GuiCustomOptionBrowser optionBrowser4(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, scrollon); GuiCustomOptionBrowser optionBrowser4(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, scrollon, 50);
optionBrowser4.SetPosition(0, 90); optionBrowser4.SetPosition(0, 90);
optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser4.SetCol2Position(65); optionBrowser4.SetCol2Position(65);