From ca1b8cb942080b9053f11c8d39ff633ff522dbb3 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 1 Jul 2013 21:41:29 -0400 Subject: [PATCH] MouseTest theme covered. --- .../ScreenTitleMenu background.lua | 7 ++- .../BGAnimations/ScreenTitleMenu overlay.lua | 11 +++- .../BGAnimations/ScreenTitleMenu underlay.lua | 26 +++++++-- .../Graphics/ScreenTitleMenu scroll.lua | 54 +++++++++++++------ 4 files changed, 74 insertions(+), 24 deletions(-) diff --git a/Themes/MouseTest/BGAnimations/ScreenTitleMenu background.lua b/Themes/MouseTest/BGAnimations/ScreenTitleMenu background.lua index 0b3a21e72a..df4bd562cd 100644 --- a/Themes/MouseTest/BGAnimations/ScreenTitleMenu background.lua +++ b/Themes/MouseTest/BGAnimations/ScreenTitleMenu background.lua @@ -1,3 +1,8 @@ return Def.Quad{ - InitCommand=cmd(Center;FullScreen;diffuse,HSV(192,1,0.8);diffusebottomedge,HSV(192,0.625,0.25)); + InitCommand=function(self) + self:Center(); + self:FullScreen(); + self:diffuse(HSV(192,1,0.8)); + self:diffusebottomedge(HSV(192,0.625,0.25)); + end; }; \ No newline at end of file diff --git a/Themes/MouseTest/BGAnimations/ScreenTitleMenu overlay.lua b/Themes/MouseTest/BGAnimations/ScreenTitleMenu overlay.lua index dedd03adcb..90765ee07c 100644 --- a/Themes/MouseTest/BGAnimations/ScreenTitleMenu overlay.lua +++ b/Themes/MouseTest/BGAnimations/ScreenTitleMenu overlay.lua @@ -1,6 +1,9 @@ local t = Def.ActorFrame{ LoadActor(THEME:GetPathG("_click","target"))..{ - InitCommand=cmd(diffusealpha,0;Real); + InitCommand=function(self) + self:diffusealpha(0); + self:Real(); + end; LeftClickMessageCommand=function(self) MESSAGEMAN:Broadcast("MouseInput", { Input = "Left" }); end; @@ -31,7 +34,11 @@ local t = Def.ActorFrame{ }; LoadFont("common normal")..{ Name="Coords"; - InitCommand=cmd(shadowlength,1;zoom,0.5;align,0,1); + InitCommand=function(self) + self:shadowlength(1); + self:zoom(0.5); + self:align(0, 1); + end; MouseInputMessageCommand=function(self,param) local cX = INPUTFILTER:GetMouseX() local cY = INPUTFILTER:GetMouseY() diff --git a/Themes/MouseTest/BGAnimations/ScreenTitleMenu underlay.lua b/Themes/MouseTest/BGAnimations/ScreenTitleMenu underlay.lua index d11b41a28f..1f62a9b065 100644 --- a/Themes/MouseTest/BGAnimations/ScreenTitleMenu underlay.lua +++ b/Themes/MouseTest/BGAnimations/ScreenTitleMenu underlay.lua @@ -3,7 +3,11 @@ local t = Def.ActorFrame{}; local mou = Def.ActorFrame{ LoadFont("common normal")..{ Name="Coords"; - InitCommand=cmd(align,0,0;x,SCREEN_LEFT+8;y,SCREEN_BOTTOM-48); + InitCommand=function(self) + self:align(0, 0); + self:x(SCREEN_LEFT + 8); + self:y(SCREEN_BOTTOM - 48); + end; }; }; local function UpdateMouse(self) @@ -13,19 +17,33 @@ local function UpdateMouse(self) local text = "[Mouse] X: ".. mouseX .." Y: ".. mouseY; coords:settext(text) end -mou.InitCommand=cmd(SetUpdateFunction,UpdateMouse); +mou.InitCommand=function(self) + self:SetUpdateFunction(); + UpdateMouse(); +end; t[#t+1] = mou; t[#t+1] = Def.ActorFrame{ LoadFont("Common normal")..{ Name="Title"; Text=THEME:GetString("MouseTest","Title"); - InitCommand=cmd(CenterX;y,SCREEN_TOP+28;diffuse,color("#333333")); + InitCommand=function(self) + self:CenterX(); + self:y(SCREEN_TOP + 28); + self:diffuse(color("#333333")); + end; }; LoadFont("Common normal")..{ Name="Instructions"; Text=THEME:GetString("MouseTest","Instructions"); - InitCommand=cmd(x,SCREEN_LEFT+12;align,0,0;y,SCREEN_TOP+42;diffuse,color("#333333");zoom,16/24;wrapwidthpixels,SCREEN_WIDTH*1.5); + InitCommand=function(self) + self:x(SCREEN_LEFT + 12); + self:align(0, 0); + self:y(SCREEN_TOP + 42); + self:diffuse(color("#333333")); + self:zoom(2 / 3); + self:wrapwidthpixels(SCREEN_WIDTH * 1.5); + end; }; }; diff --git a/Themes/MouseTest/Graphics/ScreenTitleMenu scroll.lua b/Themes/MouseTest/Graphics/ScreenTitleMenu scroll.lua index d11925aa82..d989aec3e5 100644 --- a/Themes/MouseTest/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/MouseTest/Graphics/ScreenTitleMenu scroll.lua @@ -12,30 +12,50 @@ local itemColors = { }; local t = Def.ActorFrame{ - --[[ - Def.Actor{ - Name="TitleMenuController"; - GainFocusCommand=function(self) - MESSAGEMAN:Broadcast("TitleChange",{NewColor=itemColors[index+1]}); - end; - }; - ]] LoadFont("Common Normal")..{ Text=Screen.String(text); - InitCommand=cmd(diffuse,color("1,1,1,1")); - DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,0.85")); - --GainFocusCommand=cmd(stoptweening;linear,0.25;diffuse,itemColors[index+1]); - GainFocusCommand=cmd(stoptweening;linear,0.25;diffuse,color("1,0.2,0.2,1")); - LoseFocusCommand=cmd(stoptweening;linear,0.25;diffuse,color("1,1,1,1")); + InitCommand=function(self) + self:diffuse(color("1,1,1,1")); + end; + DisabledCommand=function(self) + self:diffuse(color("0.5,0.5,0.5,0.85")); + end; + GainFocusCommand=function(self) + self:stoptweening(); + self:linear(0.25); + self:diffuse(color("1,0.2,0.2,1")); + end; + LoseFocusCommand=function(self) + self:stoptweening(); + self:linear(0.25); + self:diffuse(color("1,1,1,1")); + end; }; --[[ begin triangle ]] Def.Quad{ - InitCommand=cmd(x,-SCREEN_WIDTH*0.105;zoomto,8,24;zwrite,true;blend,'BlendMode_NoEffect'); + InitCommand=function(self) + self:x(-SCREEN_WIDTH * 0.105); + self:zoomto(8, 24); + self:zwrite(true); + self:blend('BlendMode_NoEffect'); + end; }; Def.Quad{ - InitCommand=cmd(x,-SCREEN_WIDTH*0.1;zoomto,12,12;rotationz,45;diffuselowerleft,color("0,0,0,0");ztest,true); - GainFocusCommand=cmd(stoptweening;visible,true); - LoseFocusCommand=cmd(stoptweening;visible,false); + InitCommand=function(self) + self:x(-SCREEN_WIDTH * 0.1); + self:zoomto(12, 12); + self:rotationz(45); + self:diffuselowerleft(color("0,0,0,0")); + self:ztest(true); + end; + GainFocusCommand=function(self) + self:stoptweening(); + self:visible(true); + end; + LoseFocusCommand=function(self) + self:stoptweening(); + self:visible(false); + end; }; --[[ end triangle ]] };