acc304f · unity8 · git.iko.soy

git.iko.soy/unity8

fix an issue with removing a running app from the launcher and always store pinning to the config.

Approved by Andrea Cimitan, PS Jenkins bot.

commitacc304f899da318fbc28e110f91d9ba2e83c6804 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 17 Sep 2013, 23:08 (13 years ago) parent6a74c57 d9d197d

2 files changed+73−5

compare with xenial

unifiedsplit

plugins/Unity/Launcher/launchermodel.cpp+12−3 tests/plugins/Unity/Launcher/launchermodeltest.cpp+61−2

plugins/Unity/Launcher/launchermodel.cpp+12−3

@@ -115,9 +115,11 @@ void LauncherModel::move(int oldIndex, int newIndex)

115115 m_list.move(oldIndex, newIndex);

116116 endMoveRows();

117117

118− storeAppList();

119−

120− pin(m_list.at(newIndex)->appId());

118+ if (!m_list.at(newIndex)->pinned()) {

119+ pin(m_list.at(newIndex)->appId());

120+ } else {

121+ storeAppList();

122+ }

121123}

122124

123125void LauncherModel::pin(const QString &appId, int index)

@@ -146,6 +148,8 @@ void LauncherModel::pin(const QString &appId, int index)

146148 m_list.insert(index, item);

147149 endInsertRows();

148150 }

151+

152+ storeAppList();

149153}

150154

151155void LauncherModel::requestRemove(const QString &appId)

@@ -155,6 +159,11 @@ void LauncherModel::requestRemove(const QString &appId)

155159 return;

156160 }

157161

162+ if (m_appManager->findApplication(appId)) {

163+ m_list.at(index)->setPinned(false);

164+ return;

165+ }

166+

158167 beginRemoveRows(QModelIndex(), index, index);

159168 m_list.takeAt(index)->deleteLater();

160169 endRemoveRows();

tests/plugins/Unity/Launcher/launchermodeltest.cpp+61−2

@@ -62,7 +62,14 @@ public:

6262 return QString();

6363 }

6464 unity::shell::application::ApplicationInfoInterface *get(int index) const { return m_list.at(index); }

65− unity::shell::application::ApplicationInfoInterface *findApplication(const QString &) const { return nullptr; }

65+ unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const {

66+ Q_FOREACH(MockApp* app, m_list) {

67+ if (app->appId() == appId) {

68+ return app;

69+ }

70+ }

71+ return nullptr;

72+ }

6673 unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }

6774 bool stopApplication(const QString &) { return false; }

6875 bool focusApplication(const QString &appId) {

@@ -151,9 +158,54 @@ private Q_SLOTS:

151158 QCOMPARE(launcherModel->get(1)->pinned(), false);

152159 }

153160

161+ void testRemove_data() {

162+

163+ QTest::addColumn<bool>("pinned");

164+ QTest::addColumn<bool>("running");

165+

166+ QTest::newRow("non-pinned, running") << false << true;

167+ QTest::newRow("pinned, running") << true << false;

168+ QTest::newRow("pinned, non-running") << true << false;

169+ }

170+

154171 void testRemove() {

172+ QFETCH(bool, pinned);

173+ QFETCH(bool, running);

174+

175+ // In the beginning we always have two items

155176 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

156− launcherModel->requestRemove(launcherModel->get(0)->appId());

177+

178+ // pin one if required

179+ if (pinned) {

180+ launcherModel->pin(launcherModel->get(1)->appId());

181+ }

182+

183+ // stop it if required

184+ if (!running) {

185+ appManager->removeApplication(1);

186+ }

187+

188+ // Now remove it

189+ launcherModel->requestRemove(launcherModel->get(1)->appId());

190+

191+ if (running) {

192+ // both apps are running, both apps must still be here

193+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

194+

195+ // Item must be unpinned now

196+ QCOMPARE(launcherModel->get(1)->pinned(), false);

197+

198+ } else if (pinned) {

199+ // Item 1 must go away, item 0 is here to stay

200+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

201+ }

202+

203+ // done our checks. now stop the app if was still running

204+ if (running) {

205+ appManager->removeApplication(1);

206+ }

207+

208+ // It needs to go away in any case now

157209 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

158210 }

159211

@@ -181,6 +233,13 @@ private Q_SLOTS:

181233

182234 // quicklist needs to transform to remove item. trigger it and check it item goes away

183235 launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

236+ QCOMPARE(launcherModel->get(0)->pinned(), false);

237+

238+ // still needs to be here as the app is still here

239+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

240+ // close the app

241+ appManager->removeApplication(0);

242+ // Now it needs to go away

184243 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

185244 }

186245