From 355cd4508030d40bff46c1f3696800686752ce4d Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 12 Jul 2012 16:58:45 -0500
Subject: [PATCH] fix timing display when using justice (issue 828)

---
 .../ScreenTitleMenu LifeDifficulty.lua        |  2 +-
 .../ScreenTitleMenu TimingDifficulty.lua      | 82 +++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua
index 5026c22481..16d5ce2c28 100644
--- a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
@@ -26,7 +26,7 @@ return Def.ActorFrame {
 	LoadFont("Common Normal") .. {
 		Text=GetLifeDifficulty();
 		AltText="";
-		InitCommand=cmd(x,72*0.75+8;zoom,0.875);
+		InitCommand=cmd(x,68*0.75+8;zoom,0.875;halign,0);
 		OnCommand=cmd(shadowlength,1;skewx,-0.125);
 	};
 };
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua
index 1be2c9961f..d5ab94fe65 100644
--- a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
@@ -1,42 +1,42 @@
-return Def.ActorFrame {
---[[ 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
-		OnCommand=function(self)
-			if GetTimingDifficulty() == 7 then
-				(cmd(glowshift;diffuse,Color("Yellow");diffuserightedge,Color("Red");effectcolor1,Color.Alpha( Color("Red"), 0.5 );effectcolor2,Color("Invisible");effectperiod,1.25/2))(self);
-			elseif GetTimingDifficulty() < 4 then
-				(cmd(diffuseshift;effectcolor1,Color("Blue");effectcolor2,ColorDarkTone(Color("Blue"));effectperiod,1.25))(self);
-			elseif GetTimingDifficulty() > 4 and GetTimingDifficulty < 6 then
-				(cmd(diffuseshift;effectcolor1,Color("Red");effectcolor2,ColorDarkTone(Color("Red"));effectperiod,1.25))(self);
-			else
-				(cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow")))(self);
-			end;
-		end;
-	}; --]]
--- 	LoadActor(THEME:GetPathG("OptionRowExit","frame"));
-	LoadActor(THEME:GetPathG("_icon","Timing")) .. {
-		InitCommand=cmd(x,-60;shadowlength,1);
-	};
-	LoadFont("Common Normal") .. {
-		Text=GetTimingDifficulty();
-		AltText="";
-		InitCommand=cmd(x,-72+28;horizalign,left;zoom,0.5);
-		OnCommand=cmd(shadowlength,1);
-		BeginCommand=function(self)
-			self:settextf( Screen.String("TimingDifficulty"), "" );
-		end
-	};
-	LoadFont("Common Normal") .. {
-		Text=GetTimingDifficulty();
-		AltText="";
-		InitCommand=cmd(x,72*0.75+8;zoom,0.875);
-		OnCommand=function(self)
-			(cmd(shadowlength,1;skewx,-0.125))(self);
-			if GetTimingDifficulty() == 9 then
-				self:settext("Justice");
-				(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
-			else
-				self:settext( GetTimingDifficulty() );
-			end
-		end;
-	};
+return Def.ActorFrame {
+--[[ 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
+		OnCommand=function(self)
+			if GetTimingDifficulty() == 7 then
+				(cmd(glowshift;diffuse,Color("Yellow");diffuserightedge,Color("Red");effectcolor1,Color.Alpha( Color("Red"), 0.5 );effectcolor2,Color("Invisible");effectperiod,1.25/2))(self);
+			elseif GetTimingDifficulty() < 4 then
+				(cmd(diffuseshift;effectcolor1,Color("Blue");effectcolor2,ColorDarkTone(Color("Blue"));effectperiod,1.25))(self);
+			elseif GetTimingDifficulty() > 4 and GetTimingDifficulty < 6 then
+				(cmd(diffuseshift;effectcolor1,Color("Red");effectcolor2,ColorDarkTone(Color("Red"));effectperiod,1.25))(self);
+			else
+				(cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow")))(self);
+			end;
+		end;
+	}; --]]
+-- 	LoadActor(THEME:GetPathG("OptionRowExit","frame"));
+	LoadActor(THEME:GetPathG("_icon","Timing")) .. {
+		InitCommand=cmd(x,-60;shadowlength,1);
+	};
+	LoadFont("Common Normal") .. {
+		Text=GetTimingDifficulty();
+		AltText="";
+		InitCommand=cmd(x,-72+28;horizalign,left;zoom,0.5);
+		OnCommand=cmd(shadowlength,1);
+		BeginCommand=function(self)
+			self:settextf( Screen.String("TimingDifficulty"), "" );
+		end
+	};
+	LoadFont("Common Normal") .. {
+		Text=GetTimingDifficulty();
+		AltText="";
+		InitCommand=cmd(x,68*0.75+8;zoom,0.875;halign,0);
+		OnCommand=function(self)
+			(cmd(shadowlength,1;skewx,-0.125))(self);
+			if GetTimingDifficulty() == 9 then
+				self:settext("Justice");
+				(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
+			else
+				self:settext( GetTimingDifficulty() );
+			end
+		end;
+	};
 };
\ No newline at end of file