Merge lp:~gerboland/unity-mir/phone-surface-bad-position into lp:unity-mir

[Gerry Boland]

Fix bug where sidestage app launched by upstart on the phone would not have stage overridden to be main stage, and thus positioned incorrectly.

Fix bug where sidestage app launched by upstart on the phone would not have stage overridden to be main stage, and thus positioned incorrectly.

Bug not visible with today's trunk, but the right-edge work exposes it

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

[lp:~gerboland/unity-mir/phone-surface-bad-position]

206. By Gerry Boland on 2014-03-25

Move test to remove future merge conflict

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/165
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/164

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/301/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/165

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/302/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

I don't really like the fact we define a "side stage enabled" here and in unity. But I'll figure a unity-api compatible approach to unify that when doing the proper side stage work.

 * Did you perform an exploratory manual test run of the code change and any related functionality?

Yes. Fixes the issue.

 * Did CI run pass? If not, please explain why.

Yes.

review: Approve

[lp:~gerboland/unity-mir/phone-surface-bad-position]

207. By Gerry Boland on 2014-04-01

Min size stage width is 100GU, not 60

[Michael Zanetti (mzanetti)]

Yep. fixes it on Flo too. Thanks a lot!

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-03-17 17:44:24 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-04-01 16:22:27 +0000
@@ -47,6 +47,7 @@
 
 // Default element sizes
 #define SIDE_STAGE_WIDTH_GU 40
+#define TABLET_MODE_MINIMUM_WIDTH_GU 100
 
 namespace msh = mir::shell;
 
@@ -402,6 +403,13 @@
             DLOG("Unable to instantiate application with appId '%s'", qPrintable(appId));
             return;
         }
+
+        // override stage if necessary (i.e. side stage invalid on phone)
+        if (application->stage() == Application::SideStage &&
+                m_displaySize.width() < (TABLET_MODE_MINIMUM_WIDTH_GU * m_gridUnitPx)) {
+            application->setStage(Application::MainStage);
+        }
+
         add(application);
         Q_EMIT focusRequested(appId);
     }

=== modified file 'tests/application_manager_test.cpp'
--- tests/application_manager_test.cpp	2014-03-11 03:40:26 +0000
+++ tests/application_manager_test.cpp	2014-04-01 16:22:27 +0000
@@ -299,6 +299,26 @@
     EXPECT_EQ(second_session, the_app->session());
 }
 
+TEST_F(ApplicationManagerTests,upstart_launching_sidestage_app_on_phone_forced_into_mainstage)
+{
+    using namespace ::testing;
+    QString appId("sideStage");
+
+    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId);
+    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+    ON_CALL(*mockDesktopFileReader, stageHint()).WillByDefault(Return("SideStage"));
+
+    ON_CALL(desktopFileReaderFactory, createInstanceForAppId(appId)).WillByDefault(Return(mockDesktopFileReader));
+
+    // mock upstart launching an app which reports itself as sidestage, but we're on phone
+    applicationManager.onProcessStartReportReceived(appId, false);
+
+    // ensure the app stage is overridden to be main stage
+    Application* theApp = applicationManager.findApplication(appId);
+    ASSERT_NE(theApp, nullptr);
+    EXPECT_EQ(Application::MainStage, theApp->stage());
+}
+
 TEST_F(ApplicationManagerTests,two_session_on_one_application_after_starting)
 {
     using namespace ::testing;