@@ -99,18 +99,6 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
9999 return QVariant();
100100}
101101
102−void LauncherModel::setAlerting(const QString &appId, bool alerting) {
103− int index = findApplication(appId);
104− if (index >= 0) {
105− QModelIndex modelIndex = this->index(index);
106− LauncherItem *item = m_list.at(index);
107− if (!item->focused()) {
108− item->setAlerting(alerting);
109− Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});
110− }
111− }
112−}
113−
114102unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
115103{
116104 if (index < 0 || index >= m_list.count()) {
@@ -361,11 +349,13 @@ void LauncherModel::countChanged(const QString &appId, int count)
361349 if (idx >= 0) {
362350 LauncherItem *item = m_list.at(idx);
363351 item->setCount(count);
364− if (item->countVisible()) {
365− setAlerting(item->appId(), true);
352+ QVector<int> changedRoles = {RoleCount};
353+ if (item->countVisible() && !item->alerting() && !item->focused()) {
354+ changedRoles << RoleAlerting;
355+ item->setAlerting(true);
366356 }
367357 m_asAdapter->syncItems(m_list);
368− Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});
358+ Q_EMIT dataChanged(index(idx), index(idx), changedRoles);
369359 }
370360}
371361
@@ -375,10 +365,12 @@ void LauncherModel::countVisibleChanged(const QString &appId, bool countVisible)
375365 if (idx >= 0) {
376366 LauncherItem *item = m_list.at(idx);
377367 item->setCountVisible(countVisible);
378− if (countVisible) {
379− setAlerting(item->appId(), true);
368+ QVector<int> changedRoles = {RoleCount};
369+ if (countVisible && !item->alerting() && !item->focused()) {
370+ changedRoles << RoleAlerting;
371+ item->setAlerting(true);
380372 }
381− Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});
373+ Q_EMIT dataChanged(index(idx), index(idx), changedRoles);
382374
383375 // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
384376 if (!countVisible && !item->pinned() && !item->recent()) {
@@ -501,8 +493,10 @@ void LauncherModel::alert(const QString &appId)
501493 int idx = findApplication(appId);
502494 if (idx >= 0) {
503495 LauncherItem *item = m_list.at(idx);
504− setAlerting(item->appId(), true);
505− Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
496+ if (!item->focused() && !item->alerting()) {
497+ item->setAlerting(true);
498+ Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
499+ }
506500 }
507501}
508502
@@ -585,16 +579,21 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
585579 disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);
586580
587581 LauncherItem * item = m_list.at(appIndex);
588− item->setRunning(false);
589582
590583 if (!item->pinned()) {
591584 beginRemoveRows(QModelIndex(), appIndex, appIndex);
592585 m_list.takeAt(appIndex)->deleteLater();
593586 endRemoveRows();
594587 m_asAdapter->syncItems(m_list);
595− Q_EMIT dataChanged(index(appIndex), index(appIndex), {RolePinned});
588+ } else {
589+ QVector<int> changedRoles = {RoleRunning};
590+ item->setRunning(false);
591+ if (item->focused()) {
592+ changedRoles << RoleFocused;
593+ item->setFocused(false);
594+ }
595+ Q_EMIT dataChanged(index(appIndex), index(appIndex), changedRoles);
596596 }
597− Q_EMIT dataChanged(index(appIndex), index(appIndex), {RoleRunning});
598597}
599598
600599void LauncherModel::focusedAppIdChanged()
@@ -603,8 +602,14 @@ void LauncherModel::focusedAppIdChanged()
603602 for (int i = 0; i < m_list.count(); ++i) {
604603 LauncherItem *item = m_list.at(i);
605604 if (!item->focused() && item->appId() == appId) {
605+ QVector<int> changedRoles;
606+ changedRoles << RoleFocused;
606607 item->setFocused(true);
607− Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
608+ if (item->alerting()) {
609+ changedRoles << RoleAlerting;
610+ item->setAlerting(false);
611+ }
612+ Q_EMIT dataChanged(index(i), index(i), changedRoles);
608613 } else if (item->focused() && item->appId() != appId) {
609614 item->setFocused(false);
610615 Q_EMIT dataChanged(index(i), index(i), {RoleFocused});