From 2e240a38c7efb55197ed401d1eaa78b7979fde3e Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Sun, 20 Oct 2013 21:57:50 -0700
Subject: [PATCH] Themes/default: Fix header alignment, make the background
 checkboard less gaudy Themes/: remove anything we don't ship with.

---
 .../_checkerboard (stretch).png               | Bin 3399 -> 3387 bytes
 .../default.lua                               |   2 +-
 .../ScreenSelectMusic SortOrderFrame.lua      |   2 +-
 .../ScreenWithMenuElements header/default.lua |   2 +-
 Themes/default/metrics.ini                    |  14 +++++++++++---
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/_checkerboard (stretch).png b/Themes/default/BGAnimations/ScreenWithMenuElements background/_checkerboard (stretch).png
index 8646ca8e2b22d329c0dc4ab0b74f9908c850ab0c..b36db9672a149d7ece3b2761a74806e8d774c693 100644
GIT binary patch
delta 195
zcmX>uwOeX}@<xjoE`GKoZ+91l{~)+v@AAnL6~%2C*h@TpUD@w)3A0OEmrE7yVqjp(
z^>lFzskrs_nj<fRArJGxWmZv+`3aU%Q;nDp_D{`Dd$u8L(xyXk*I6bD@c2yD=V6^}
z#G?hIHIZl)?mbVvgVJuS-hG@)Zn7eeHBer3vJ;OKkk$oa9xQAgahpf%F^xPPXY)?a
PW&i?DS3j3^P6<r_Is88(

delta 643
zcmdljbzEwK^5h9zq8pWCxat*>J%W507^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky
z5YL|!f7FeEfvL#T#WAGf)|+dAybKCF&W;K<X8q!lHuES`UnsAC_wL>9jgur2HzYF&
zFgP$UFfy<(5N6a9qlkqlqlhyJ?j(rvdLrFPoZ-Z%`d2hLB5}hiqb7C+4hDtEU%Bii
z2XOP&H!#egzAuT31CXn8h>kJh%&hy!z`*eTKQqI@2yXW+H)nDIxeT7JelF{r5}E+s
Cjz{1C

diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua
index bf1b1f0fce..4b1e7bf815 100644
--- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
+++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
@@ -11,7 +11,7 @@ t[#t+1] = Def.ActorFrame {
 		InitCommand=cmd(hide_if,hideFancyElements;);
 		LoadActor("_checkerboard") .. {
 			InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3.5;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
-			OnCommand=cmd(texcoordvelocity,0,0.25;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1);
+			OnCommand=cmd(texcoordvelocity,0,0.25;diffuse,color("#ffd400");fadetop,1);
 		};
 	};
 	LoadActor("_particleLoader") .. {
diff --git a/Themes/default/Graphics/ScreenSelectMusic SortOrderFrame.lua b/Themes/default/Graphics/ScreenSelectMusic SortOrderFrame.lua
index 0abf8c6a8a..c64e4903db 100644
--- a/Themes/default/Graphics/ScreenSelectMusic SortOrderFrame.lua	
+++ b/Themes/default/Graphics/ScreenSelectMusic SortOrderFrame.lua	
@@ -3,6 +3,6 @@ return Def.ActorFrame {
 		InitCommand=cmd(diffusebottomedge,Color("Orange"));
 	};
 	LoadActor(THEME:GetPathG("_icon","Sort")) .. {
-		InitCommand=cmd(x,-60;shadowlength,1;diffuse,Color("Orange");diffusetopedge,Color("Yellow"));
+		InitCommand=cmd(x,-60;shadowlength,1;);
 	};
 };
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua
index 637c818c4c..6003ef87fe 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
@@ -13,7 +13,7 @@ t[#t+1] = Def.Quad {
 t[#t+1] = LoadFont("Common Bold") .. {
 	Name="HeaderText";
 	Text=Screen.String("HeaderText");
-	InitCommand=cmd(x,-SCREEN_CENTER_X+24;y,24;zoom,1;horizalign,left;shadowlength,0;maxwidth,200);
+	InitCommand=cmd(x,-SCREEN_CENTER_X+24;y,26;zoom,1;horizalign,left;shadowlength,0;maxwidth,200);
 	OnCommand=cmd(strokecolor,Color.Invisible;diffusebottomedge,color("0.75,0.75,0.75"));
 	UpdateScreenHeaderMessageCommand=function(self,param)
 		self:settext(param.Header);
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 3f13a5f27d..f98d69e5eb 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -513,9 +513,17 @@ Fallback="StepsDisplay"
 	# self:effectclock('beatnooffset'); \
 # end;
 PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
+	local offset = itemIndex / numItems \
+	local rate = 4 \
 	local fItemWidth = ( 256 / numItems ) \
 	self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \
 	self:zoomtowidth(fItemWidth); \
+	self:diffuseramp(); \
+	self:effectcolor2(color("1,1,1,1")); \
+	self:effectcolor1(color("0.5,0.5,0.5,1")); \
+	self:effectclock('beat'); \
+	self:effecttiming(rate*0.25,rate*0.75,rate*0.25,rate*0.75); \
+	self:effectoffset(1.25-offset); \
 end;
 # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	# local fItemWidth = ( 256 / numItems ) \
@@ -542,9 +550,9 @@ ArtistPrependString=""
 
 [ScreenSystemLayer]
 ShowClock=true
-CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1);
+CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;
 #
-CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2);
+CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;
 
 [ScreenConsoleOverlay]
 
@@ -586,7 +594,7 @@ AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;zoom,0.675;maxwidth,480/0
 AlternateHelpDisplayOffCommand=linear,0.175;zoomy,0
 
 TimerX=SCREEN_RIGHT-36-4
-TimerY=SCREEN_TOP+22
+TimerY=SCREEN_TOP+24
 TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer");
 # TimerOnCommand=fov,90;vanishpoint,SCREEN_RIGHT-36-4,SCREEN_TOP+20;draworder,5;visible,PREFSMAN:GetPreference("MenuTimer");rotationy,90;decelerate,0.4;rotationy,0;
 TimerOffCommand=