7a5cf51 · unity8 · git.iko.soy

qml/Shell.qml−3

compare with xenial

unifiedsplit

@@ -172,9 +172,6 @@ Item {

172

173 Component.onCompleted: {

174 theme.name = "Ubuntu.Components.Themes.SuruDark"

175− if (ApplicationManager.count > 0) {

176− ApplicationManager.focusApplication(ApplicationManager.get(0).appId);

177− }

178 finishStartUpTimer.start();

175 finishStartUpTimer.start();

179 }

176 }

180

177

tests/mocks/Unity/Application/ApplicationManager.cpp−24

@@ -87,7 +87,6 @@ void ApplicationManager::onWindowCreatedTimerTimeout()

87void ApplicationManager::onWindowCreated()

88{

89 startApplication("unity8-dash");

90− focusApplication("unity8-dash");

91}

90}

92

91

93int ApplicationManager::rowCount(const QModelIndex& parent) const {

92int ApplicationManager::rowCount(const QModelIndex& parent) const {

@@ -269,9 +268,6 @@ bool ApplicationManager::stopApplication(const QString &appId)

269 if (application == nullptr)

268 if (application == nullptr)

270 return false;

269 return false;

271

270

272− if (application->appId() == focusedApplicationId()) {

273− unfocusCurrentApplication();

274− }

275 application->close();

271 application->close();

276 return true;

272 return true;

277}

273}

@@ -285,17 +281,6 @@ QString ApplicationManager::focusedApplicationId() const {

285 return QString();

281 return QString();

286}

282}

287

283

288−bool ApplicationManager::focusApplication(const QString &appId)

289−{

290− ApplicationInfo *application = findApplication(appId);

291− if (application == nullptr)

292− return false;

293−

294− application->setFocused(true);

295−

296− return true;

297−}

298−

299bool ApplicationManager::requestFocusApplication(const QString &appId)

284bool ApplicationManager::requestFocusApplication(const QString &appId)

300{

285{

301 ApplicationInfo *application = findApplication(appId);

286 ApplicationInfo *application = findApplication(appId);

@@ -307,15 +292,6 @@ bool ApplicationManager::requestFocusApplication(const QString &appId)

307 return true;

292 return true;

308}

293}

309

294

310−void ApplicationManager::unfocusCurrentApplication()

311−{

312− for (ApplicationInfo *app : m_runningApplications) {

313− if (app->focused()) {

314− app->setFocused(false);

315− }

316− }

317−}

318−

319void ApplicationManager::buildListOfAvailableApplications()

295void ApplicationManager::buildListOfAvailableApplications()

320{

296{

321 /*

297 /*

tests/mocks/Unity/Application/ApplicationManager.h−2

@@ -59,8 +59,6 @@ class ApplicationManager : public ApplicationManagerInterface {

59

60 // Application control methods

61 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;

62− Q_INVOKABLE bool focusApplication(const QString &appId) override;

63− Q_INVOKABLE void unfocusCurrentApplication() override;

64 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

62 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

65 Q_INVOKABLE bool stopApplication(const QString &appId) override;

63 Q_INVOKABLE bool stopApplication(const QString &appId) override;

66

64

tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−3

@@ -107,7 +107,7 @@ public:

107 }

108 return false;

109 }

110− bool focusApplication(const QString &appId) override {

110+ bool focusApplication(const QString &appId) {

111 Q_FOREACH(MockApp* app, m_list) {

112 app->setFocused(app->appId() == appId);

113 }

@@ -115,8 +115,6 @@ public:

115 return true;

116 }

117

118− void unfocusCurrentApplication() override { }

119−

120 void addApplication(MockApp *app) {

118 void addApplication(MockApp *app) {

121 beginInsertRows(QModelIndex(), count(), count());

119 beginInsertRows(QModelIndex(), count(), count());

122 m_list.append(app);

120 m_list.append(app);