diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua index 459cd26b35..f641baa6ab 100644 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua @@ -21,7 +21,7 @@ t[#t+1] = Def.ActorFrame { -- Scanline LoadActor("_texture scanline") .. { InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT; - customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/32; + customtexturerect,0,0,SCREEN_WIDTH/16,(SCREEN_HEIGHT/16)/2; diffuse,Color.Black; diffusealpha,0.25; ); diff --git a/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua b/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua index fa40c9c589..6733623a59 100644 --- a/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua @@ -1,11 +1,22 @@ local gc = Var("GameCommand"); +local colors = { + Exit = Color.Red; +} + local t = Def.ActorFrame {}; t[#t+1] = LoadFont("Common Normal") .. { - Text=gc:GetText(); + Text=gc:GetName(); + InitCommand=cmd(horizalign,right;playcommand,"Set"); + SetCommand=function(self) + if colors[gc:GetName()] ~= nil then + self:diffuse(colors[gc:GetName()]); + end + end; + GainFocusCommand=cmd(diffusealpha,1); + LoseFocusCommand=cmd(diffusealpha,0.5); }; -t.GainFocusCommand=cmd(diffusealpha,1); -t.LoseFocusCommand=cmd(diffusealpha,0.5); + return t; \ No newline at end of file diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua index 8c4742c670..857215cdbd 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua @@ -2,8 +2,8 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,-64); Def.Quad { - InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH-32,2); - OnCommand=cmd(diffusealpha,0.5); + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,64); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75); }; }; return t \ No newline at end of file diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua index 28ad31bf77..9701a290a1 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua @@ -2,12 +2,12 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,48); Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH-32,2); - OnCommand=cmd(diffusealpha,0.5); + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,48); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75); }; }; t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration"; - InitCommand=cmd(y,48); + InitCommand=cmd(y,40;visible,false); LoadFont("Common Normal") .. { Text="TIME"; InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-16;y,-4.5); @@ -20,15 +20,10 @@ t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration"; }; --]] }; t[#t+1] = Def.ActorFrame { Name="HeaderTextDecoration"; - InitCommand=cmd(y,48); - LoadFont("Common Normal") .. { - Text="SELECT"; - InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5); - OnCommand=cmd(zoom,0.5); - }; + InitCommand=cmd(y,40); LoadFont("Common Normal") .. { Text="OPTIONS"; - InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+64;y,-4.5); + InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5); OnCommand=cmd(); }; }; diff --git a/Themes/rsr/metrics.ini b/Themes/rsr/metrics.ini index e5b8dc7a54..0c02360c0d 100644 --- a/Themes/rsr/metrics.ini +++ b/Themes/rsr/metrics.ini @@ -1,22 +1,26 @@ [Global] FallbackTheme=_fallback + [ScreenWithMenuElements] ShowHeader=true HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP HeaderOnCommand= HeaderOffCommand= + # ShowFooter=true FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM FooterOnCommand= FooterOffCommand= + # -TimerX=SCREEN_WIDTH-64 -TimerY=SCREEN_TOP+48-4.5 -TimerOnCommand= +TimerX=SCREEN_RIGHT-16 +TimerY=SCREEN_TOP+40-4.5 +TimerOnCommand=draworder,105 TimerOffCommand= + [MenuTimer] Text1OnCommand=stopeffect;stoptweening;vertalign,bottom;horizalign,right Text1FormatFunction=function(fSeconds) \ @@ -28,9 +32,16 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol #~ MESSAGEMAN:Broadcast("TimerWarning"); \ #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ #~ end; + [ScreenTitleMenu] ShowHeader=true ShowFooter=true + +ScrollerX=SCREEN_RIGHT-16 +ScrollerY=SCREEN_CENTER_Y + +ScrollerColors="Exit:#ff0000" + [ScreenSelectMusic] MusicWheelX=SCREEN_RIGHT-128-18 MusicWheelOnCommand=draworder,-1