Merge lp:~mzanetti/unity8/no-displace-when-external into lp:unity8

[Michael Zanetti]

don't displace windows if the OSK is on another screen

* No related branches

* Tested on frieza

* no change that requires design review

* no packaging change

[Michał Sawicz (saviq)]

Lookin' good.

review: Approve

[Daniel d'Andrada (dandrader)]

FWIW: the AbstractStage.visibleRect (or just oskRect, for simplicity) approach would have that covered and at the same time improve modularity by avoiding DesktopStage fiddling with SurfaceManager.inputMethodSurface and UbuntuKeyboardInfo, which is really of interest only to InputMethod.qml.

As this bug shows, DesktopStage doesn't want to know about SurfaceManager.inputMethodSurface or UbuntuKeyboardInfo (handling those is the job of InputMethod), it wants to know about the InputMethod component state, which is what actually gets displayed in from of DesktopStage.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2529
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1668/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2213
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1178/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1178/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1178
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2241
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2147
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2147
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2147
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2138/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1668/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-06-20 16:25:15 +0000
+++ qml/Shell.qml	2016-07-05 09:58:40 +0000
@@ -387,6 +387,11 @@
                 property: "topLevelSurfaceList"
                 value: topLevelSurfaceList
             }
+            Binding {
+                target: applicationsDisplayLoader.item
+                property: "oskEnabled"
+                value: shell.oskEnabled
+            }
         }
     }
 

=== modified file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	2016-05-26 11:17:55 +0000
+++ qml/Stages/AbstractStage.qml	2016-07-05 09:58:40 +0000
@@ -43,6 +43,7 @@
      // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
     property int leftMargin: 0
     property alias paintBackground: background.visible
+    property bool oskEnabled: false
 
     // To be read from outside
     property var mainApp: null

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2016-06-27 18:44:07 +0000
+++ qml/Stages/DesktopStage.qml	2016-07-05 09:58:40 +0000
@@ -274,7 +274,7 @@
                     value: appDelegate.requestedY -
                            Math.min(appDelegate.requestedY - PanelState.panelHeight,
                                     Math.max(0, UbuntuKeyboardInfo.height - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
-                    when: appDelegate.focus && appDelegate.state == "normal"
+                    when: root.oskEnabled && appDelegate.focus && appDelegate.state == "normal"
                           && SurfaceManager.inputMethodSurface
                           && SurfaceManager.inputMethodSurface.state != Mir.HiddenState
                           && SurfaceManager.inputMethodSurface.state != Mir.MinimizedState

=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
--- tests/qmltests/Stages/tst_DesktopStage.qml	2016-06-27 18:44:07 +0000
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-07-05 09:58:40 +0000
@@ -519,13 +519,15 @@
 
         function test_oskDisplacesWindow_data() {
             return [
-                {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: units.gu(5)},
-                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight},
-                {tag: "displace a bit", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: (root.height / 2) - units.gu(40)},
+                {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: units.gu(5), oskEnabled: true},
+                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},
+                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},
+                {tag: "osk not on this screen", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: units.gu(10), oskEnabled: false},
             ]
         }
 
         function test_oskDisplacesWindow(data) {
+            desktopStageLoader.item.oskEnabled = data.oskEnabled
             var dashAppDelegate = startApplication("unity8-dash");
             var oldOSKState = SurfaceManager.inputMethodSurface.state;
             SurfaceManager.inputMethodSurface.state = Mir.RestoredState;