system message, map controllers cleanup

stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua

@@ -26,22 +26,24 @@ local function CreditsText( pn )
 end
 
 local t = Def.ActorFrame {
-	LoadFont(Var "LoadingScreen","message") .. {
+	Def.ActorFrame {
-		InitCommand=cmd(maxwidth,750;
+		Def.Quad {
-		horizalign,left;vertalign,top;
+			InitCommand=cmd(zoomtowidth,SCREEN_WIDTH;zoomtoheight,30;horizalign,left;vertalign,top;y,SCREEN_TOP;diffusetopedge,color("#FFFFFF");diffusebottomedge,color("#000000");diffusealpha,0;);
-		shadowlength,2;shadowcolor,color("#000000");
+			OnCommand=cmd(finishtweening;x,SCREEN_LEFT;diffusealpha,0.3;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;);		
-		y,SCREEN_TOP+20;
+			OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;);
-		diffusealpha,0
+		};
-		);
+		LoadFont(Var "LoadingScreen","SystemMessage") .. {
-
+			Name="Text";
+			InitCommand=cmd(maxwidth,750;horizalign,left;vertalign,top;y,SCREEN_TOP+10;strokecolor,color("#000000");shadowlength,0;diffusealpha,0;);
+			OnCommand=cmd(finishtweening;x,SCREEN_LEFT+10;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;);
+			OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;);
+		};
 		SystemMessageMessageCommand = function(self, params)
-			self:settext( params.Message );
+			self:GetChild("Text"):settext( params.Message );
-			local f = cmd(finishtweening;x,SCREEN_LEFT+20;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH); f(self);
 			self:playcommand( "On" );
 			if params.NoAnimate then
 				self:finishtweening();
 			end
-			f = cmd(sleep,5;linear,0.5;diffusealpha,0); f(self);
 			self:playcommand( "Off" );
 		end;
 		HideSystemMessageMessageCommand = cmd(finishtweening);

stepmania/Themes/default/Fonts/ScreenMapControllers title.redir

@@ -0,0 +1 @@
+Common Normal

stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir

@@ -0,0 +1 @@
+Common Normal

stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir

@@ -0,0 +1 @@
+_blank

stepmania/Themes/default/metrics.ini

@@ -1874,8 +1874,8 @@ MemoryCardIcons=true
 CancelTransitionsOut=false
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+35
-HeaderOnCommand=addy,-50;linear,0.25;addy,50;draworder,1
+HeaderOnCommand=
-HeaderOffCommand=linear,0.25;addy,-90;
+HeaderOffCommand=
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
 FooterOnCommand=draworder,-1;vertalign,bottom

stepmania/src/ScreenMapControllers.cpp

@@ -34,7 +34,7 @@ void ScreenMapControllers::Init()
 	m_soundDelete.Load( THEME->GetPathS(m_sName,"delete"), true );
 
 
-	m_textDevices.LoadFromFont( THEME->GetPathF(m_sName,"normal") );
+	m_textDevices.LoadFromFont( THEME->GetPathF(m_sName,"devices") );
 	m_textDevices.SetName( "Devices" );
 	LOAD_ALL_COMMANDS_AND_SET_XY( m_textDevices );
 	this->AddChild( &m_textDevices );