Mercurial > wow > buffalo2

changeset 41:7a65ed86e4dd r42-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- prevent animation Play from firing more than once before block:Hide is called
author Nenue
date Sun, 24 Apr 2016 14:28:49 -0400
parents 03ed70f846de
children c73051785f19
files ObjectiveTracker/ObjectiveTracker.xml ObjectiveTracker/TrackerBlock.lua
diffstat 2 files changed, 11 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/ObjectiveTracker/ObjectiveTracker.xml	Sun Apr 24 14:15:25 2016 -0400
+++ b/ObjectiveTracker/ObjectiveTracker.xml	Sun Apr 24 14:28:49 2016 -0400
@@ -371,41 +371,21 @@
         end
         self.blockFadeOut:Stop()
       </OnShow>
-      <OnHide>
-        Veneer.print('Frame')(self:GetName(), '|cFF00FF00HIDE|r', debugstack(1,3,1))
-        if(self.DebugTab:IsShown()) then
-          self.DebugTab:Hide()
-        end
-        -- make sure neither of these execute their onFinished upon re-show
-        self.blockFadeOut:Stop()
-        self.questFadeIn:Stop()
-      </OnHide>
     </Scripts>
     <Animations>
       <AnimationGroup name="$parent_BlockSlide" parentKey="blockShift" ignoreFramerateThrottle="true">
         <Translation parentKey="translation" offsetX="0" offsetY="0" smoothing="OUT" order="1" duration=".25" />
       </AnimationGroup>
       <AnimationGroup name="$parent_BlockFadeIn" setToFinalAlpha="true" parentKey="questFadeIn" ignoreFramerateThrottle="true">
-        <Alpha duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
-        <Scale duration="0.25" order="1" fromScaleX="0.1" fromScaleY="0.1" toScaleX="1" toScaleY="1">
-          <Origin point="CENTER">
-            <Offset x="-50" y="0"/>
-          </Origin>
-        </Scale>
-        <Translation childKey="LineGlow" duration="0.75" order="1" offsetX="65" offsetY="0"/>
-        <Alpha childKey="SoftGlow" duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
-        <Alpha childKey="SoftGlow" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
-        <Scale childKey="SoftGlow" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="0.8" toScaleY="0.8"/>
-        <Alpha childKey="StarBurst" duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
-        <Alpha childKey="StarBurst" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
-        <Scale childKey="StarBurst" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="1" toScaleY="1"/>
-        <Alpha childKey="LineSheen" startDelay="0.15" duration="0.5" order="1" fromAlpha="0" toAlpha="0.75"/>
-        <Alpha childKey="LineSheen" startDelay="0.75" duration="0.5" order="1" fromAlpha="0.75" toAlpha="0"/>
-        <Translation childKey="LineSheen" startDelay="0.15" duration="1.5" order="1" offsetX="280" offsetY="0"/>
       </AnimationGroup>
       <AnimationGroup name="$parent_BlockFade" parentKey="blockFadeOut" ignoreFramerateThrottle="true" looping="NONE">
         <Alpha duration="0.25" order="1" fromAlpha="1" toAlpha="0" />
         <Translation duration="0.25" order="1" offsetX="260" offsetY="0" smoothing="OUT" />
+        <Scale order="1" duration="0.25" fromScaleX="1" fromScaleY="1" toScaleX="0.1" toScaleY="0.1">
+          <Origin point="TOP">
+            <Offset x="0" y="0" />
+          </Origin>
+        </Scale>
       </AnimationGroup>
     </Animations>
     <Layers>
@@ -446,27 +426,7 @@
         </Texture>
       </Layer>
       <Layer level="ARTWORK">
-          <Texture parentKey="StarBurst" hidden="false" alpha="0" alphaMode="ADD" atlas="OBJFX_StarBurst" useAtlasSize="true">
-            <Anchors>
-              <Anchor point="LEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.titlebg"/>
-            </Anchors>
-          </Texture>
-          <Texture parentKey="LineSheen" hidden="false" alpha="0" alphaMode="ADD" atlas="OBJFX_LineBurst">
-            <Size x="60" y="15"/>
-            <Anchors>
-              <Anchor point="LEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.titlebg" x="0" y="0"/>
-            </Anchors>
-          </Texture>
-          <Texture parentKey="LineGlow" hidden="false" alpha="0" alphaMode="ADD" atlas="OBJFX_LineGlow" useAtlasSize="true">
-            <Anchors>
-              <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.titlebg" x="-50" y="18"/>
-            </Anchors>
-          </Texture>
-          <Texture parentKey="SoftGlow" hidden="false" alpha="0" alphaMode="ADD" atlas="OBJFX_Glow" useAtlasSize="true">
-            <Anchors>
-              <Anchor point="CENTER"  relativeKey="$parent.titlebg" relativePoint="BOTTOMLEFT" x="20" y="20"/>
-            </Anchors>
-          </Texture>
+
 
         <Texture parentKey="typeTag" file="Interface\QuestFrame\QuestTypeIcons" alphaMode="ADD" hidden="true">
           <Size x="18" y="18"/>
--- a/ObjectiveTracker/TrackerBlock.lua	Sun Apr 24 14:15:25 2016 -0400
+++ b/ObjectiveTracker/TrackerBlock.lua	Sun Apr 24 14:28:49 2016 -0400
@@ -145,7 +145,12 @@
   end
   block.blockFadeOut:SetScript('OnFinished', blockFadeOut_OnFinished)
   block:SetScript('OnHide', function(self)
+    fprint(self:GetName(), '|cFF00FF00HIDE|r', debugstack(1,3,1))
+    if(self.DebugTab:IsShown()) then
+      self.DebugTab:Hide()
+    end
     self.blockFadeOut:SetScript('OnFinished', blockFadeOut_OnFinished)
+    self.isAnimating = nil
   end)
   print('  used/free: |cFFFFFF00' .. #handler.usedBlocks .. '|r/|cFF00FFFF'..#handler.freeBlocks ..'|r')
   return block