Skip to content
This repository
Browse code

revert part of 60b0ee0 that somehow snuck in

  • Loading branch information...
commit ed808027fa5031be94ebb11609b456649a769bda 1 parent 626fb22
authored January 08, 2013

Showing 1 changed file with 8 additions and 8 deletions. Show diff stats Hide diff stats

  1. 16  xbmc/guilib/GUIControl.cpp
16  xbmc/guilib/GUIControl.cpp
@@ -32,7 +32,7 @@ using namespace std;
32 32
 
33 33
 CGUIControl::CGUIControl()
34 34
 {
35  
-  m_hasProcessed = false;
  35
+  m_hasRendered = false;
36 36
   m_bHasFocus = false;
37 37
   m_controlID = 0;
38 38
   m_parentID = 0;
@@ -77,7 +77,7 @@ CGUIControl::CGUIControl(int parentID, int controlID, float posX, float posY, fl
77 77
   ControlType = GUICONTROL_UNKNOWN;
78 78
   m_bInvalidated = true;
79 79
   m_bAllocated=false;
80  
-  m_hasProcessed = false;
  80
+  m_hasRendered = false;
81 81
   m_parentControl = NULL;
82 82
   m_hasCamera = false;
83 83
   m_pushedUpdates = false;
@@ -93,7 +93,7 @@ CGUIControl::~CGUIControl(void)
93 93
 
94 94
 void CGUIControl::AllocResources()
95 95
 {
96  
-  m_hasProcessed = false;
  96
+  m_hasRendered = false;
97 97
   m_bInvalidated = true;
98 98
   m_bAllocated=true;
99 99
 }
@@ -113,7 +113,7 @@ void CGUIControl::FreeResources(bool immediately)
113 113
     }
114 114
     m_bAllocated=false;
115 115
   }
116  
-  m_hasProcessed = false;
  116
+  m_hasRendered = false;
117 117
 }
118 118
 
119 119
 void CGUIControl::DynamicResourceAlloc(bool bOnOff)
@@ -162,7 +162,6 @@ void CGUIControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregio
162 162
 {
163 163
   // update our render region
164 164
   m_renderRegion = g_graphicsContext.generateAABB(CalcRenderRegion());
165  
-  m_hasProcessed = true;
166 165
 }
167 166
 
168 167
 // the main render routine.
@@ -187,6 +186,7 @@ void CGUIControl::DoRender()
187 186
 
188 187
 void CGUIControl::Render()
189 188
 {
  189
+  m_hasRendered = true;
190 190
 }
191 191
 
192 192
 bool CGUIControl::OnAction(const CAction &action)
@@ -709,8 +709,8 @@ void CGUIControl::ResetAnimations()
709 709
 bool CGUIControl::CheckAnimation(ANIMATION_TYPE animType)
710 710
 {
711 711
   // rule out the animations we shouldn't perform
712  
-  if (!IsVisible() || !HasProcessed())
713  
-  { // hidden or never processed - don't allow exit or entry animations for this control
  712
+  if (!IsVisible() || !HasRendered())
  713
+  { // hidden or never rendered - don't allow exit or entry animations for this control
714 714
     if (animType == ANIM_TYPE_WINDOW_CLOSE)
715 715
     { // could be animating a (delayed) window open anim, so reset it
716 716
       ResetAnimation(ANIM_TYPE_WINDOW_OPEN);
@@ -849,7 +849,7 @@ bool CGUIControl::Animate(unsigned int currentTime)
849 849
   for (unsigned int i = 0; i < m_animations.size(); i++)
850 850
   {
851 851
     CAnimation &anim = m_animations[i];
852  
-    anim.Animate(currentTime, HasProcessed() || visible == DELAYED);
  852
+    anim.Animate(currentTime, HasRendered() || visible == DELAYED);
853 853
     // Update the control states (such as visibility)
854 854
     UpdateStates(anim.GetType(), anim.GetProcess(), anim.GetState());
855 855
     // and render the animation effect

0 notes on commit ed80802

Please sign in to comment.
Something went wrong with that request. Please try again.