From 20cb3c9e93a9de098bfc5b37387626188b334fde Mon Sep 17 00:00:00 2001
From: giantpune <giantpune@6224d900-cc1e-4992-856c-54780e90ce17>
Date: Tue, 5 May 2009 08:04:07 +0000
Subject: [PATCH] Hopefully fixed erratic click detection in settings.

---
 source/libwiigui/gui_customoptionbrowser.cpp | 3 ++-
 source/menu.cpp                              | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/libwiigui/gui_customoptionbrowser.cpp b/source/libwiigui/gui_customoptionbrowser.cpp
index f48e5187..b3db18d1 100644
--- a/source/libwiigui/gui_customoptionbrowser.cpp
+++ b/source/libwiigui/gui_customoptionbrowser.cpp
@@ -129,7 +129,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
 		optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 		optionVal[i]->SetPosition(250,0);
 
-		optionBtn[i] = new GuiButton(width-28,GAMESELECTSIZE);
+		optionBtn[i] = new GuiButton(width,GAMESELECTSIZE);//(width-28,GAMESELECTSIZE);
 		optionBtn[i]->SetParent(this);
 		optionBtn[i]->SetLabel(optionTxt[i], 0);
 		optionBtn[i]->SetLabel(optionVal[i], 1);
@@ -138,6 +138,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
 		optionBtn[i]->SetRumble(false);
 		optionBtn[i]->SetTrigger(trigA);
 		optionBtn[i]->SetSoundClick(btnSoundClick);
+		
 	}
 }
 
diff --git a/source/menu.cpp b/source/menu.cpp
index 0ba28829..386e6943 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -2820,7 +2820,7 @@ static int MenuDiscList()
 							menu = MENU_EXIT;
 						}
 					}break;
-				}	
+				}
 			bool returnHere = true;// prompt to start game
 			while (returnHere)
 			{
@@ -3277,6 +3277,7 @@ static int MenuSettings()
 	settingsbackgroundbtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	settingsbackgroundbtn.SetPosition(0, 0);
 	settingsbackgroundbtn.SetImage(&settingsbackground);
+	settingsbackgroundbtn.SetTrigger(&trigA);
 
     GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255});
 	backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
@@ -3349,7 +3350,7 @@ static int MenuSettings()
 	GuiCustomOptionBrowser optionBrowser2(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, 0);
 	optionBrowser2.SetPosition(0, 90);
 	optionBrowser2.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	optionBrowser2.SetCol2Position(150);
+	optionBrowser2.SetCol2Position(180);
 	GuiWindow w(screenwidth, screenheight);
 
 	int pageToDisplay = 1;
@@ -3675,6 +3676,10 @@ static int MenuSettings()
 				}
 				lockBtn.ResetState();
 			}
+			if(settingsbackgroundbtn.GetState() == STATE_CLICKED)
+			{
+			optionBrowser2.SetFocus(1);
+			}
 		}
 
 	}