Merge lp:~gerboland/unity8/add-focus-requested-support into lp:unity8

[Gerry Boland]

WM: AppManager has new signal to ask shell to request focus for app - use it to properly animate and focus the app. If app wants to be side stage, but no side stage available, override the application stage.

WM: AppManager has new signal to ask shell to request focus for app - use it to properly animate and focus the app. If app wants to be side stage, but no side stage available, override the application stage.

Requires lp:~gerboland/unity-mir/add-focus-requested-signal to operate correctly

[lp:~gerboland/unity8/add-focus-requested-support]

434. By Gerry Boland on 2013-10-11

Revert comment change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/unity8-ci/1365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4944/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1365
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1365/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1364/console
    ABORTED: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1120/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/819
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2845/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2365
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2405

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1365/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Yes please :)

review: Approve

=== modified file 'Components/ApplicationManagerWrapper.qml'
--- Components/ApplicationManagerWrapper.qml	2013-10-08 17:30:29 +0000
+++ Components/ApplicationManagerWrapper.qml	2013-10-11 11:43:22 +0000
@@ -18,7 +18,7 @@
 import Unity.Application 0.1
 
 Item {
-    id: applicationManager
+    id: root
 
     property alias mainStageApplications: mainStageModel
     property alias sideStageApplications: sideStageModel
@@ -30,6 +30,8 @@
 
     property bool fake: ApplicationManager.fake ? ApplicationManager.fake : false
 
+    signal focusRequested(string appId)
+
     ApplicationsModelStageFiltered {
         id: mainStageModel
         stage: ApplicationInfo.MainStage
@@ -61,6 +63,16 @@
                 }
             }
         }
+
+        onFocusRequested: {
+            // if no side stage enabled, override application's stage parameter
+            var app = ApplicationManager.findApplication(appId);
+            if (app && app.stage === ApplicationInfo.SideStage && !sideStageEnabled) {
+                app.stage = ApplicationInfo.MainStage;
+            }
+
+            root.focusRequested(appId);
+        }
     }
 
     function activateApplication(desktopFile, argument) {
 
=== modified file 'Components/Stage.qml'
--- Components/Stage.qml	2013-10-02 21:59:30 +0000
+++ Components/Stage.qml	2013-10-11 11:43:22 +0000
@@ -84,6 +84,11 @@
         }
     }
 
+    Connections {
+        target: applicationManager
+        onFocusRequested: activateApplication(appId)
+    }
+
     /* Keep a reference to the focused application so that we can safely
        unfocus it when the stage is not fully shown and refocus it when the stage
        is fully shown again.
 
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2013-09-05 12:21:35 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2013-10-11 11:43:22 +0000
@@ -35,6 +35,7 @@
     Q_OBJECT
 
     Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
+    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
 
     // Only exists in this fake implementation
 
 
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2013-09-09 11:42:11 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2013-10-11 11:43:22 +0000
@@ -99,6 +99,7 @@
     void keyboardHeightChanged();
     void keyboardVisibleChanged();
     void focusRequested(FavoriteApplication favoriteApplication);
+    void focusRequested(const QString &appId);
 
  private:
     void add(ApplicationInfo *application);