d831ee8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

comment the if

d831ee8Albert Astals13 years ago

plugins/DashViews/abstractjournal.cpp+7

compare with xenial

unifiedsplit

@@ -211,6 +211,7 @@ void AbstractJournal::refill()

211

212 if (added || removed) {

213 m_implicitHeightDirty = true;

214+ polish();

214 }

215 }

215}

216}

216

217

@@ -311,6 +312,12 @@ void AbstractJournal::itemCreated(int modelIndex, QObject *object)

311 }

312 }

312#endif

313#endif

313 item->setParentItem(this);

314 item->setParentItem(this);

315+

316+ // We only need to call createItem if we are here because of an asynchronous generation

317+ // otherwise we are in this slot because createItem is creating the item sync

318+ // and thus we don't need to call createItem again, nor need to set m_implicitHeightDirty

319+ // and call polish because the sync createItem was called from addVisibleItems that

320+ // is called from refill that will already do those if an item was added

314 if (modelIndex == m_asyncRequestedIndex) {

321 if (modelIndex == m_asyncRequestedIndex) {

315 createItem(modelIndex, false);

322 createItem(modelIndex, false);

316 m_implicitHeightDirty = true;

323 m_implicitHeightDirty = true;

plugins/DashViews/listviewwithpageheader.cpp−1

@@ -871,7 +871,6 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

871 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();

872 context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);

873 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

874− Q_ASSERT (modelIndex == m_asyncRequestedIndex);

875 if (modelIndex == m_asyncRequestedIndex) {

874 if (modelIndex == m_asyncRequestedIndex) {

876 createItem(modelIndex, false);

875 createItem(modelIndex, false);

877 refill();

876 refill();