actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

system message, map controllers cleanup

Browse Source
This commit is contained in:
Chris Danford
2009-04-07 00:54:54 +00:00
parent 555d9188e6
commit a393efdd13
8 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua
+13 -11
View File
@@ -26,22 +26,24 @@ local function CreditsText( pn )
end end
local t = Def.ActorFrame { 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) 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" ); self:playcommand( "On" );
if params.NoAnimate then if params.NoAnimate then
self:finishtweening(); self:finishtweening();
end end
f = cmd(sleep,5;linear,0.5;diffusealpha,0); f(self);
self:playcommand( "Off" ); self:playcommand( "Off" );
end; end;
HideSystemMessageMessageCommand = cmd(finishtweening); HideSystemMessageMessageCommand = cmd(finishtweening);
stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir → stepmania/Themes/default/Fonts/ScreenMapControllers devices.redir
View File
stepmania/Themes/default/Fonts/ScreenMapControllers title.redir
+1
View File
@@ -0,0 +1 @@
Common Normal
stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir
+1
View File
@@ -0,0 +1 @@
Common Normal
stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir
+1
View File
@@ -0,0 +1 @@
_blank
stepmania/Themes/default/Graphics/ScreenSystemLayer MessageFrame.redir → stepmania/Themes/default/Graphics/ScreenSystemLayer SystemMessageFrame.redir
View File
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -1874,8 +1874,8 @@ MemoryCardIcons=true
CancelTransitionsOut=false CancelTransitionsOut=false
HeaderX=SCREEN_CENTER_X HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP+35 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 FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM FooterY=SCREEN_BOTTOM
FooterOnCommand=draworder,-1;vertalign,bottom FooterOnCommand=draworder,-1;vertalign,bottom
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ void ScreenMapControllers::Init()
m_soundDelete.Load( THEME->GetPathS(m_sName,"delete"), true ); 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" ); m_textDevices.SetName( "Devices" );
LOAD_ALL_COMMANDS_AND_SET_XY( m_textDevices ); LOAD_ALL_COMMANDS_AND_SET_XY( m_textDevices );
this->AddChild( &m_textDevices ); this->AddChild( &m_textDevices );