Merge lp:~gerboland/qtmir/fix-unfocus-notification into lp:qtmir

[Gerry Boland]

AppMan: fix dbus GetWindowStack & GetAppFromPid APIs. On suspend, mark focused application unfocused, and reverse on resume.

Approved by: Daniel d'Andrada

AppMan: fix dbus GetWindowStack & GetAppFromPid APIs. On suspend, mark focused application unfocused, and reverse on resume.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Gerry Boland (gerboland)]

Note the twin MR for this patch is here:
https://code.launchpad.net/~gerboland/unity-mir/unfocusOnGreeter/+merge/227940
(last commit needed to be added to qtmir)

[Daniel d'Andrada (dandrader)]

The commit message doesn't match what the diff actually does.

[Daniel d'Andrada (dandrader)]

Looks good.

review: Approve

[lp:~gerboland/qtmir/fix-unfocus-notification]

225. By Gerry Boland on 2014-08-11

Merge trunk

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-08-08 10:37:50 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-08-11 15:47:22 +0000
@@ -322,13 +322,17 @@
     if (m_suspended) {
         suspendApplication(m_mainStageApplication);
         suspendApplication(m_sideStageApplication);
-        if (m_focusedApplication)
+        if (m_focusedApplication) {
+            m_focusedApplication->setFocused(false);
             m_dbusWindowStack->FocusedWindowChanged(0, QString(), 0);
+        }
     } else {
         resumeApplication(m_mainStageApplication);
         resumeApplication(m_sideStageApplication);
-        if (m_focusedApplication)
+        if (m_focusedApplication) {
+            m_focusedApplication->setFocused(true);
             m_dbusWindowStack->FocusedWindowChanged(0, m_focusedApplication->appId(), m_focusedApplication->stage());
+        }
     }
 }
 

=== modified file 'src/modules/Unity/Application/dbuswindowstack.h'
--- src/modules/Unity/Application/dbuswindowstack.h	2014-07-01 13:38:06 +0000
+++ src/modules/Unity/Application/dbuswindowstack.h	2014-08-11 15:47:22 +0000
@@ -54,8 +54,8 @@
     explicit DBusWindowStack(ApplicationManager* parent);
     ~DBusWindowStack();
 
-    Q_INVOKABLE Q_SCRIPTABLE AppIdDesktopFile GetAppIdFromPid(unsigned int pid);
-    Q_INVOKABLE Q_SCRIPTABLE QList<WindowInfo> GetWindowStack();
+    Q_INVOKABLE Q_SCRIPTABLE qtmir::AppIdDesktopFile GetAppIdFromPid(unsigned int pid);
+    Q_INVOKABLE Q_SCRIPTABLE QList<qtmir::WindowInfo> GetWindowStack();
     Q_INVOKABLE Q_SCRIPTABLE QStringList GetWindowProperties(unsigned int window_id, const QString &app_id, const QStringList &names);
 
 Q_SIGNALS:

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2014-07-21 15:51:17 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2014-08-11 15:47:22 +0000
@@ -502,7 +502,7 @@
     EXPECT_EQ(first_session, the_app->session());
 }
 
-TEST_F(ApplicationManagerTests,suspended_suspends_focused_app)
+TEST_F(ApplicationManagerTests,suspended_suspends_focused_app_and_marks_it_unfocused_in_the_model)
 {
     using namespace ::testing;
     quint64 a_procId = 5921;
@@ -532,11 +532,12 @@
     applicationManager.setSuspended(true);
 
     EXPECT_EQ(Application::Suspended, the_app->state());
+    EXPECT_EQ(false, the_app->focused());
 
     applicationManager.setSuspended(false);
 
     EXPECT_EQ(Application::Running, the_app->state());
-
+    EXPECT_EQ(true, the_app->focused());
 }
 
 TEST_F(ApplicationManagerTests,requestFocusApplication)