From b9ce2d4142a0709ad3dd6d5c516d6639d22e8fd2 Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Wed, 25 Jan 2012 07:19:07 +0100
Subject: [PATCH] (360) Can now navigate to settings screen

---
 360/main.c                   |  4 ++++
 360/media/ssnes_settings.xui |  2 +-
 360/menu.cpp                 | 17 +++++------------
 360/menu.h                   |  3 +--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/360/main.c b/360/main.c
index 4656a7f321..59a392e62b 100644
--- a/360/main.c
+++ b/360/main.c
@@ -144,6 +144,10 @@ int main(int argc, char *argv[])
 	//in a different way
 	//DmMapDevkitDrive();
 	MountAll();
+
+	XSetFileCacheSize(0x100000);
+	XMountUtilityDriveEx(XMOUNTUTILITYDRIVE_FORMAT0,8192, 0);
+		
 	ssnes_main_clear_state();
 
 	config_set_defaults();
diff --git a/360/media/ssnes_settings.xui b/360/media/ssnes_settings.xui
index 1c48ddf7ca..bd6d7adcec 100644
--- a/360/media/ssnes_settings.xui
+++ b/360/media/ssnes_settings.xui
@@ -10,7 +10,7 @@
 <Height>289.015991</Height>
 <Position>392.000000,226.112015,0.000000</Position>
 <ClassOverride>SSNESSettings</ClassOverride>
-<TabCount>2</TabCount>
+<DefaultFocus>XuiBtnRewind</DefaultFocus>
 </Properties>
 <XuiText>
 <Properties>
diff --git a/360/menu.cpp b/360/menu.cpp
index 2a11e8f08b..e37e6f1a1f 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -49,8 +49,6 @@ HRESULT CSSNES::UnregisterXuiClasses (void)
 HRESULT CSSNESSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
 	GetChildById(L"XuiBtnRewind", &m_rewind);
-	GetChildById(L"XuiBackButton1", &m_back);
-
 	return S_OK;
 }
 
@@ -80,13 +78,6 @@ HRESULT CSSNESMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 
 HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed,  BOOL& bHandled )
 {
-	if ( hObjPressed == m_rewind )
-	{
-	}
-	else if (hObjPressed == m_back )
-	{
-	}
-
 	bHandled = TRUE;
 	return S_OK;
 }
@@ -104,7 +95,7 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed,  BOOL& bHandled )
 	else if ( hObjPressed == m_settings )
 	{
 		HXUIOBJ		hSSNESSettings;
-		hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &hSSNESSettings );
+		hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &hSSNESSettings);
 		
 		if (FAILED(hr))
 		{
@@ -153,13 +144,15 @@ int menu_init (void)
 		return 1;
 	}
 
-	hr = app.LoadFirstScene( L"file://game:/media/", L"ssnes_main.xur", NULL);
+	hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &hMainScene);
 	if (FAILED(hr))
 	{
-		SSNES_ERR("Failed to load first scene.\n");
+		SSNES_ERR("Failed to create scene 'ssnes_main.xur'.\n");
 		return 1;
 	}
 
+	XuiSceneNavigateFirst(app.GetRootObj(), hMainScene, XUSER_INDEX_FOCUS);
+
 	return 0;
 }
 
diff --git a/360/menu.h b/360/menu.h
index 416a7568eb..f4f056975d 100644
--- a/360/menu.h
+++ b/360/menu.h
@@ -37,7 +37,6 @@ class CSSNESSettings: public CXuiSceneImpl
 {
 protected:
 	CXuiControl m_rewind;
-	CXuiControl m_back;
 public:
 	HRESULT OnInit( XUIMessageInit* pInitData, BOOL& bHandled );
 	HRESULT OnNotifyPress( HXUIOBJ hObjPressed,  BOOL& bHandled );
@@ -47,7 +46,7 @@ public:
 		XUI_ON_XM_NOTIFY_PRESS( OnNotifyPress )
 	XUI_END_MSG_MAP();
 
-	XUI_IMPLEMENT_CLASS(CSSNESSettings, L"SSNESSettings", XUI_CLASS_SCENE)
+	XUI_IMPLEMENT_CLASS(CSSNESSettings, L"SSNESSettings", XUI_CLASS_TABSCENE)
 };
 
 int menu_init (void);