From 519ad8d2431fb409f762b25aa87aa1e0b5e8b8aa Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Mon, 2 Mar 2015 20:51:47 -0700 Subject: [PATCH] Added stoptweening to ExplanationTogether OnCommands because it was possible to trigger a tween overflow by holding escape in edit mode. --- Themes/_fallback/metrics.ini | 6 +++--- .../Graphics/ScreenWithMenuElements header/default.lua | 2 +- Themes/default/metrics.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 96b18197ee..f67ee80759 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2282,7 +2282,7 @@ ExplanationP2OnCommand=shadowlength,1;wrapwidthpixels,256/0.5;zoom,0.5;halign,1; ExplanationP2OffCommand= ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+184 -ExplanationTogetherOnCommand=shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0 +ExplanationTogetherOnCommand=stoptweening;shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand=stoptweening # DisqualifyP1X= @@ -2700,7 +2700,7 @@ SeparateExitRowY=SCREEN_CENTER_Y+180 ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+174 -ExplanationTogetherOnCommand=zoom,0.75;shadowlength,0;wrapwidthpixels,600/0.75;cropright,1;linear,0.5;cropright,0 +ExplanationTogetherOnCommand=stoptweening;zoom,0.75;shadowlength,0;wrapwidthpixels,600/0.75;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand=stoptweening [ScreenOptionsSimpleService] @@ -2796,7 +2796,7 @@ LineHighlightP2ChangeToExitCommand= # ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+174 -ExplanationTogetherOnCommand=zoom,0.625;shadowlength,0;wrapwidthpixels,600/0.665;cropright,1;linear,0.5;cropright,0 +ExplanationTogetherOnCommand=stoptweening;zoom,0.625;shadowlength,0;wrapwidthpixels,600/0.665;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand=stoptweening [ScreenOptionsServiceExtendedChild] diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index e7abdf5550..c1e1aba54b 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -37,7 +37,7 @@ t[#t+1] = LoadFont("Common Bold") .. { t[#t+1] = Def.Quad { Name="Underline"; InitCommand=cmd(x,-SCREEN_CENTER_X+24-4;y,36;horizalign,left); - OnCommand=cmd(diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,192;fadeleft,8/192;faderight,0.5; + OnCommand=cmd(stoptweening;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,192;fadeleft,8/192;faderight,0.5; visible,string.len( Screen.String("HeaderText") ) > 0 ); }; diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 9805deacea..e0b870373a 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1245,7 +1245,7 @@ ExplanationP2OnCommand=diffuse,PlayerColor(PLAYER_2);shadowlength,1;wrapwidthpix ExplanationP2OffCommand= ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+184 -ExplanationTogetherOnCommand=shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0 +ExplanationTogetherOnCommand=stoptweening;shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand=stoptweening [ScreenOptionsMaster]