Fixes issue where it wasn't being managed right and kept going negative.
This commit also adds setVisible in a few places missed by the last
change.
Task-number: QTBUG-20437
Change-Id: I4efaab7b34784dfbc42dd1acd0a5be3b38a8605a
Reviewed-on: http://codereview.qt.nokia.com/2074
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
if (m_stasis.contains(d->delegate))
qWarning() << "Current model particles prefers overwrite:false";
//remove old item from the particle that is dying to make room for this one
- if (d->delegate){
+ if (d->delegate)
m_deletables << d->delegate;
- m_activeCount--;
- }
d->delegate = 0;
if (!m_pendingItems.isEmpty()){
d->delegate = m_pendingItems.front();
d->delegate->setParentItem(this);
if (m_fade)
d->delegate->setOpacity(0.);
+ d->delegate->setVisible(false);//Will be set to true when we prepare the next frame
m_activeCount++;
}
}
if (t >= 1.0){//Usually happens from load
m_deletables << item;
data->delegate = 0;
- m_activeCount--;
}else{//Fade
data->delegate->setVisible(true);
if (m_fade){
if (m_available.isEmpty())
return;
m_requests << m_system->m_groupData[gIdx]->data[pIdx];
- m_activeCount++;
}
void QSGModelParticle::processPending()
if (m_fade)
item->setOpacity(0.);
m_model->release(item);
+ m_activeCount--;
}
m_deletables.clear();
m_available << datum->modelIndex;
datum->modelIndex = -1;
datum->delegate = 0;
- m_activeCount--;
}
if (!m_available.isEmpty()){
mpa->attach();
}
datum->delegate->setParentItem(this);
- datum->delegate->setOpacity(0.0);
+ if (m_fade)
+ datum->delegate->setOpacity(0.0);
+ datum->delegate->setVisible(false);//Will be set to true when we prepare the next frame
+ m_activeCount++;
}
}
m_requests.clear();
m_deletables << data->delegate;
data->modelIndex = -1;
data->delegate = 0;
- m_activeCount--;
continue;
}else{//Fade
data->delegate->setVisible(true);