Skip to content

test pr #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ivy233 wants to merge 1 commit into from
Closed

test pr #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/models/appsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,12 @@ AppsModel::AppsModel(QObject *parent)
const QModelIndex sourceIndex = m_sourceModel->index(sourceRow, 0);
if (normalizedDesktopId(sourceData(sourceIndex, DesktopIdRoleName).toString()) != desktopId)
continue;
if (!acceptsSourceIndex(sourceIndex))
return;

const QPersistentModelIndex persistentSourceIndex(sourceIndex);
if (m_rows.contains(persistentSourceIndex))
const int adapterRow = m_rows.indexOf(persistentSourceIndex);
if (adapterRow < 0)
return;

const int adapterRow = adapterRowForSourceRow(sourceRow);
beginInsertRows({}, adapterRow, adapterRow);
m_rows.insert(adapterRow, persistentSourceIndex);
endInsertRows();
Q_EMIT dataChanged(index(adapterRow, 0), index(adapterRow, 0), { AppsModel::IconNameRole });
return;
}
});
Expand Down Expand Up @@ -405,8 +400,7 @@ void AppsModel::rebuildRows()
if (m_sourceModel) {
for (int row = 0; row < m_sourceModel->rowCount(); ++row) {
const QModelIndex sourceIndex = m_sourceModel->index(row, 0);
const QString desktopId = normalizedDesktopId(sourceData(sourceIndex, DesktopIdRoleName).toString());
if (acceptsSourceIndex(sourceIndex) && !AppMgr::instance()->isPendingAppItem(desktopId))
if (acceptsSourceIndex(sourceIndex))
m_rows.append(sourceIndex);
}
}
Expand All @@ -417,7 +411,10 @@ bool AppsModel::shouldDelaySourceIndex(const QModelIndex &sourceIndex) const
{
const QString desktopId = normalizedDesktopId(sourceData(sourceIndex, DesktopIdRoleName).toString());
const QString iconName = sourceData(sourceIndex, IconNameRoleName).toString();
return AppMgr::instance()->waitForIcon(desktopId, iconName);
// Track the item for icon-readiness polling, but never delay row insertion.
// Rows are inserted immediately; icons update in-place via dataChanged when ready.
AppMgr::instance()->waitForIcon(desktopId, iconName);
return false;
}

void AppsModel::updateIconData()
Expand Down
Loading