alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Calendar DaysModel] Don't call layoutChanged() and emit dataChanged() with roles

Browse Source 
LayoutChanged causes QML to destroy all delegates and re-create them.
Since the number of days doesn't change but only the numbers, we can just call dataChanged on all roles.

Furthermore, when agenda-related data changes, only the containsEventItems role
might have changed, so only emit a change for it.

CHANGELOG: Performance when changing months in the calendar has been greatly improved

REVIEW: 128648
This commit is contained in:
Kai Uwe Broulik 2016-08-14 11:48:11 +02:00
parent 920dbcb1e8
commit 97a3611c16
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/declarativeimports/calendar/daysmodel.cpp
View File

@ -98,9 +98,6 @@ void DaysModel::update()
m_eventsData.clear(); m_eventsData.clear();
// We always have 42 items (or weeks * num of days in week) so we only have to tell the view that the data changed.
layoutChanged();
const QDate modelFirstDay(m_data->at(0).yearNumber, m_data->at(0).monthNumber, m_data->at(0).dayNumber); const QDate modelFirstDay(m_data->at(0).yearNumber, m_data->at(0).monthNumber, m_data->at(0).dayNumber);
if (m_pluginsManager) { if (m_pluginsManager) {
@ -108,6 +105,9 @@ void DaysModel::update()
eventsPlugin->loadEventsForDateRange(modelFirstDay, modelFirstDay.addDays(42)); eventsPlugin->loadEventsForDateRange(modelFirstDay, modelFirstDay.addDays(42));
} }
} }
// We always have 42 items (or weeks * num of days in week) so we only have to tell the view that the data changed.
emit dataChanged(index(0, 0), index(m_data->count() - 1, 0));
} }
void DaysModel::onDataReady(const QMultiHash<QDate, CalendarEvents::EventData> &data) void DaysModel::onDataReady(const QMultiHash<QDate, CalendarEvents::EventData> &data)
@ -118,7 +118,10 @@ void DaysModel::onDataReady(const QMultiHash<QDate, CalendarEvents::EventData> &
if (data.contains(QDate::currentDate())) { if (data.contains(QDate::currentDate())) {
m_agendaNeedsUpdate = true; m_agendaNeedsUpdate = true;
} }
layoutChanged();
// only the containsEventItems role may have changed
emit dataChanged(index(0, 0), index(m_data->count() - 1, 0), {containsEventItems});
Q_EMIT agendaUpdated(QDate::currentDate()); Q_EMIT agendaUpdated(QDate::currentDate());
} }
@ -142,7 +145,7 @@ void DaysModel::onEventModified(const CalendarEvents::EventData &data)
Q_FOREACH (const QDate date, updatesList) { Q_FOREACH (const QDate date, updatesList) {
const QModelIndex changedIndex = indexForDate(date); const QModelIndex changedIndex = indexForDate(date);
if (changedIndex.isValid()) { if (changedIndex.isValid()) {
Q_EMIT dataChanged(changedIndex, changedIndex); Q_EMIT dataChanged(changedIndex, changedIndex, {containsEventItems});
} }
Q_EMIT agendaUpdated(date); Q_EMIT agendaUpdated(date);
} }
@ -168,7 +171,7 @@ void DaysModel::onEventRemoved(const QString &uid)
Q_FOREACH (const QDate date, updatesList) { Q_FOREACH (const QDate date, updatesList) {
const QModelIndex changedIndex = indexForDate(date); const QModelIndex changedIndex = indexForDate(date);
if (changedIndex.isValid()) { if (changedIndex.isValid()) {
Q_EMIT dataChanged(changedIndex, changedIndex); Q_EMIT dataChanged(changedIndex, changedIndex, {containsEventItems});
} }
Q_EMIT agendaUpdated(date); Q_EMIT agendaUpdated(date);
} }