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

fix issue 370, issue 376, issue 374, issue 372, and issue 358. created a new function to remove soundover from buttons.

Browse Source
This commit is contained in:
giantpune 2009-05-28 23:18:37 +00:00
parent 518858a351
commit 1faa39a755
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libwiigui/gui.h
View File

@ -819,6 +819,8 @@ class GuiButton : public GuiElement
//!Sets the sound to play on click //!Sets the sound to play on click
//!\param s Pointer to GuiSound object //!\param s Pointer to GuiSound object
void SetSoundClick(GuiSound * s); void SetSoundClick(GuiSound * s);
//!\param reset the soundover to NULL
void RemoveSoundOver();
//!Constantly called to draw the GuiButtons ToolTip //!Constantly called to draw the GuiButtons ToolTip
//!Sets the button's Tooltip on over //!Sets the button's Tooltip on over
//!\param tt Pointer to GuiElement object, x & y Positioning, h & v Align //!\param tt Pointer to GuiElement object, x & y Positioning, h & v Align

6
source/libwiigui/gui_button.cpp
View File

@ -254,6 +254,12 @@ void GuiButton::SetToolTip(GuiElement* tt, int x, int y, int h_align, int v_alig
} }
} }
void GuiButton::RemoveSoundOver()
{
LOCK(this);
soundOver = NULL;
}
/** /**
* Draw the button on screen * Draw the button on screen
*/ */

5
source/libwiigui/gui_gamegrid.cpp
View File

@ -138,6 +138,7 @@ GuiGameGrid::GuiGameGrid(int w, int h, struct discHdr * l, int gameCnt, const ch
if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) { if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
game[i]->SetVisible(false); game[i]->SetVisible(false);
game[i]->SetClickable(false); game[i]->SetClickable(false);
game[i]->RemoveSoundOver();
} }
} }
} }
@ -375,10 +376,12 @@ void GuiGameGrid::Update(GuiTrigger * t)
game[i]->SetImage(coverImg[i]); game[i]->SetImage(coverImg[i]);
game[i]->SetVisible(true); game[i]->SetVisible(true);
game[i]->SetClickable(true); game[i]->SetClickable(true);
game[i]->SetSoundOver(btnSoundOver);
coverImg[i]->SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_IN, 65); coverImg[i]->SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_IN, 65);
if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) { if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
game[i]->SetVisible(false); game[i]->SetVisible(false);
game[i]->SetClickable(false); game[i]->SetClickable(false);
game[i]->RemoveSoundOver();
} }
} }
btnRight->ResetState(); btnRight->ResetState();
@ -430,11 +433,13 @@ void GuiGameGrid::Update(GuiTrigger * t)
game[i]->ResetState(); game[i]->ResetState();
game[i]->SetVisible(true); game[i]->SetVisible(true);
game[i]->SetImage(coverImg[i]); game[i]->SetImage(coverImg[i]);
game[i]->SetSoundOver(btnSoundOver);
game[i]->SetClickable(true); game[i]->SetClickable(true);
coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 65); coverImg[i]->SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 65);
if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) { if (((changed+pagesize)>gameCnt)&&(i>((gameCnt-changed)-1))) {
game[i]->SetVisible(false); game[i]->SetVisible(false);
game[i]->SetClickable(false); game[i]->SetClickable(false);
game[i]->RemoveSoundOver();
} }
} }
btnLeft->ResetState(); btnLeft->ResetState();

12
source/menu.cpp
View File

@ -1024,7 +1024,7 @@ int GameWindowPrompt()
GuiText sizeTxt("", 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{50, 50, 50, 255}); //TODO: get the size here GuiText sizeTxt("", 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{50, 50, 50, 255}); //TODO: get the size here
sizeTxt.SetAlignment(ALIGN_RIGHT, ALIGN_TOP); sizeTxt.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
sizeTxt.SetPosition(-60,70); sizeTxt.SetPosition(-110,70);
// GuiImage diskImg; // GuiImage diskImg;
GuiDiskCover diskImg; GuiDiskCover diskImg;
@ -1084,7 +1084,15 @@ int GameWindowPrompt()
GuiImage btnFavoriteImg; GuiImage btnFavoriteImg;
btnFavoriteImg.SetWidescreen(CFG.widescreen); btnFavoriteImg.SetWidescreen(CFG.widescreen);
GuiButton btnFavorite(&btnFavoriteImg,&btnFavoriteImg, 2, 5, -125, -60, &trigA, &btnSoundOver, &btnClick,1); //GuiButton btnFavorite(&btnFavoriteImg,&btnFavoriteImg, 2, 5, -125, -60, &trigA, &btnSoundOver, &btnClick,1);
GuiButton btnFavorite(imgFavorite.GetWidth(), imgFavorite.GetHeight());
btnFavorite.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
btnFavorite.SetPosition(-125, -60);
btnFavorite.SetImage(&btnFavoriteImg);
btnFavorite.SetSoundOver(&btnSoundOver);
btnFavorite.SetSoundClick(&btnClick);
btnFavorite.SetTrigger(&trigA);
btnFavorite.SetEffectGrow();
GuiImage btnLeftImg(&imgLeft); GuiImage btnLeftImg(&imgLeft);
if (Settings.wsprompt == yes) if (Settings.wsprompt == yes)