Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

revert part of 60b0ee0 that somehow snuck in

  • Loading branch information...
commit ed808027fa5031be94ebb11609b456649a769bda 1 parent 626fb22
Jonathan Marshall authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 xbmc/guilib/GUIControl.cpp
View
16 xbmc/guilib/GUIControl.cpp
@@ -32,7 +32,7 @@ using namespace std;
CGUIControl::CGUIControl()
{
- m_hasProcessed = false;
+ m_hasRendered = false;
m_bHasFocus = false;
m_controlID = 0;
m_parentID = 0;
@@ -77,7 +77,7 @@ CGUIControl::CGUIControl(int parentID, int controlID, float posX, float posY, fl
ControlType = GUICONTROL_UNKNOWN;
m_bInvalidated = true;
m_bAllocated=false;
- m_hasProcessed = false;
+ m_hasRendered = false;
m_parentControl = NULL;
m_hasCamera = false;
m_pushedUpdates = false;
@@ -93,7 +93,7 @@ CGUIControl::~CGUIControl(void)
void CGUIControl::AllocResources()
{
- m_hasProcessed = false;
+ m_hasRendered = false;
m_bInvalidated = true;
m_bAllocated=true;
}
@@ -113,7 +113,7 @@ void CGUIControl::FreeResources(bool immediately)
}
m_bAllocated=false;
}
- m_hasProcessed = false;
+ m_hasRendered = false;
}
void CGUIControl::DynamicResourceAlloc(bool bOnOff)
@@ -162,7 +162,6 @@ void CGUIControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregio
{
// update our render region
m_renderRegion = g_graphicsContext.generateAABB(CalcRenderRegion());
- m_hasProcessed = true;
}
// the main render routine.
@@ -187,6 +186,7 @@ void CGUIControl::DoRender()
void CGUIControl::Render()
{
+ m_hasRendered = true;
}
bool CGUIControl::OnAction(const CAction &action)
@@ -709,8 +709,8 @@ void CGUIControl::ResetAnimations()
bool CGUIControl::CheckAnimation(ANIMATION_TYPE animType)
{
// rule out the animations we shouldn't perform
- if (!IsVisible() || !HasProcessed())
- { // hidden or never processed - don't allow exit or entry animations for this control
+ if (!IsVisible() || !HasRendered())
+ { // hidden or never rendered - don't allow exit or entry animations for this control
if (animType == ANIM_TYPE_WINDOW_CLOSE)
{ // could be animating a (delayed) window open anim, so reset it
ResetAnimation(ANIM_TYPE_WINDOW_OPEN);
@@ -849,7 +849,7 @@ bool CGUIControl::Animate(unsigned int currentTime)
for (unsigned int i = 0; i < m_animations.size(); i++)
{
CAnimation &anim = m_animations[i];
- anim.Animate(currentTime, HasProcessed() || visible == DELAYED);
+ anim.Animate(currentTime, HasRendered() || visible == DELAYED);
// Update the control states (such as visibility)
UpdateStates(anim.GetType(), anim.GetProcess(), anim.GetState());
// and render the animation effect
Please sign in to comment.
Something went wrong with that request. Please try again.