From a14ab84dc73081c1876caebac47d1d91e67cdf79 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Tue, 21 Dec 2010 16:58:36 -0600
Subject: [PATCH] make options menus go back to the proper screen (e.g. UI
 Options goes back to "More Options" instead of ScreenOptionsService)

---
 Themes/_fallback/metrics.ini | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 2ecc558d59..dff31ac3f0 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2550,13 +2550,13 @@ ShowExitRow=true
 [ScreenTestInput]
 Class="ScreenTestInput"
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 
 [ScreenOptionsSystemDirection]
 Fallback="ScreenOptionsServiceChild"
-PrevScreen=Branch.TitleMenu()
-NextScreen=Branch.TitleMenu()
+PrevScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -2583,6 +2583,8 @@ Line22="conf,EventMode"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -2607,6 +2609,8 @@ Line20="conf,VisualDelaySeconds"
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 LineNames="2,3,4,8,11,13,14,15,16,28,29,30"
 Line2="conf,ScoringType"
 Line3="conf,TimingWindowScale"
@@ -2630,6 +2634,8 @@ Line30="conf,FastLoad"
 
 [ScreenAppearanceOptions]
 Fallback="ScreenOptionsServiceChild"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 LineNames="1,2,3,4,5,14,15,17,18,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
@@ -2646,6 +2652,8 @@ Line19="conf,NumBackgrounds"
 # user interface options that aren't related to themes, etc.
 # (some don't get used/modified too often)
 Fallback="ScreenOptionsServiceChild"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 LineNames="1,3,4,6,7,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
@@ -2665,7 +2673,8 @@ Line14="conf,ShowSongOptions"
 
 [ScreenOptionsInput]
 Fallback="ScreenOptionsServiceChild"
-# should we put map/test input in this section too?
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
 LineNames="1,2,3,4,5"
 Line1="conf,AutoMapOnJoyChange"
 Line2="conf,OnlyDedicatedMenuButtons"
@@ -2674,8 +2683,10 @@ Line4="conf,ArcadeOptionsNavigation"
 Line5="conf,MusicWheelSwitchSpeed"
 
 [ScreenOptionsArcade]
-# shit that's tied to arcade features
 Fallback="ScreenOptionsServiceChild"
+NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsExtended"
+# stuff tied to arcade features
 LineNames="1,2,3,4,5,6"
 Line1="conf,GetRankingName"
 Line2="conf,CoinMode"
@@ -3445,7 +3456,7 @@ Fallback="TextBanner"
 Fallback="ScreenWithMenuElements"
 Class="ScreenEditMenu"
 NextScreen="ScreenEdit"
-PrevScreen=Branch.TitleMenu()
+PrevScreen="ScreenOptionsEdit"
 EditMenuType="EditMenu"
 ExplanationX=SCREEN_CENTER_X
 ExplanationY=SCREEN_BOTTOM-56
@@ -3489,6 +3500,7 @@ Fallback="ScreenEditMenu"
 Class="ScreenEditMenu"
 #
 NextScreen="ScreenPractice"
+PrevScreen="ScreenOptionsEdit"
 EditMenuType="PracticeMenu"
 
 [PracticeMenu]