Merge lp:~lukas-kde/unity8/occlusion-transparency into lp:unity8

[Lukáš Tinkl]

Don't hide windows that are behind a maximized one

Don't hide windows that are behind a maximized one

Fixes issues with transparent apps, such as the new terminal (lp:1666170)

* 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

* If you changed the UI, has there been a design review?

N/A

[Michael Zanetti (mzanetti)]

As discussed on IRC, we should only do this for apps that have requested a transparent surface.

This, however, requires QtMir to pass that info on to the shell still.

review: Needs Fixing

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

FAILED: Continuous integration, rev:2809
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3156/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4138
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2428
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2428
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4166
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4006/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

surfaceItem.opacity === 1.0

This is the MirSurfaceItem/QQuickItem::opacity property you're reading, which is a renderer-only hint.

MirSurfaceItem will expose a boolean "surfaceOpaque" property that will actually tell you if the frame the client draws uses transparency or not.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> surfaceItem.opacity === 1.0
>
> This is the MirSurfaceItem/QQuickItem::opacity property you're reading, which
> is a renderer-only hint.
>
> MirSurfaceItem will expose a boolean "surfaceOpaque" property that will
> actually tell you if the frame the client draws uses transparency or not.

Ok, that's indeed more correct; let's wait for that

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

FAILED: Continuous integration, rev:2810
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3164/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4153
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2439
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2439
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4181
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4019/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4019/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4019/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4019/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4019/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4019
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4019/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

The function you want is possibly "mir::graphics::Renderable::shaped()", which tells you if it is something other than an opaque rectangle.

Unmerged revisions

2810. By Lukáš Tinkl on 2017-02-21

take opacity into account when calculating occlusion

2809. By Lukáš Tinkl on 2017-02-20

don't occlude delegates behind a maximized window

this can't work with transparent windows

=== modified file 'qml/Stage/ApplicationWindow.qml'
--- qml/Stage/ApplicationWindow.qml	2016-09-22 14:17:39 +0000
+++ qml/Stage/ApplicationWindow.qml	2017-02-21 13:57:20 +0000
@@ -28,6 +28,7 @@
     property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
     readonly property string title: surface && surface.name !== "" ? surface.name : d.name
     readonly property QtObject focusedSurface: d.focusedSurface.surface
+    readonly property bool isFullyOpaque: d.focusedSurface.isFullyOpaque
 
     // to be set from outside
     property QtObject surface

=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2017-01-26 11:10:01 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-02-21 13:57:20 +0000
@@ -38,6 +38,7 @@
     property alias maximizeButtonShown: decoration.maximizeButtonShown
     property alias interactive: applicationWindow.interactive
     readonly property alias orientationChangesEnabled: applicationWindow.orientationChangesEnabled
+    readonly property alias isFullyOpaque: applicationWindow.isFullyOpaque
 
     // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
     property bool hasDecoration: true

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-02-16 13:44:45 +0000
+++ qml/Stage/Stage.qml	2017-02-21 13:57:20 +0000
@@ -347,6 +347,8 @@
         }
 
         readonly property real virtualKeyboardHeight: root.inputMethodRect.height
+
+        property bool anyWindowAnimating: false
     }
 
     Component.onCompleted: priv.updateMainAndSideStageIndexes();
@@ -825,6 +827,7 @@
                 readonly property bool canBeMaximizedHorizontally: maximumWidth == 0 || maximumWidth >= appContainer.width
                 readonly property bool canBeMaximizedVertically: maximumHeight == 0 || maximumHeight >= appContainer.height
                 readonly property alias orientationChangesEnabled: decoratedWindow.orientationChangesEnabled
+                readonly property alias isFullyOpaque: decoratedWindow.isFullyOpaque
 
                 // TODO drop our own windowType once Mir/Miral/Qtmir gets in sync with ours
                 property int windowState: WindowStateStorage.WindowStateNormal
@@ -993,6 +996,8 @@
                          )
                          || appDelegate.fullscreen
                          || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running
+                         || priv.anyWindowAnimating          // bug #1666363
+                         || (priv.foregroundMaximizedAppDelegate && !priv.foregroundMaximizedAppDelegate.isFullyOpaque)   // bug #1666170
 
                 function close() {
                     model.window.close();
@@ -1530,11 +1535,12 @@
                         to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
                         enabled: appDelegate.animationsEnabled
                         SequentialAnimation {
+                            ScriptAction { script: { priv.anyWindowAnimating = true; } }
                             PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                             UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
                                 duration: priv.animationDuration }
                             PropertyAction { target: appDelegate; property: "visuallyMaximized" }
-                            ScriptAction { script: { fakeRectangle.stop(); } }
+                            ScriptAction { script: { fakeRectangle.stop(); priv.anyWindowAnimating = false; } }
                         }
                     }
                 ]

=== modified file 'qml/Stage/SurfaceContainer.qml'
--- qml/Stage/SurfaceContainer.qml	2016-09-22 13:35:35 +0000
+++ qml/Stage/SurfaceContainer.qml	2017-02-21 13:57:20 +0000
@@ -39,6 +39,9 @@
     // to update surface activeFocus. See mock MirSurfaceItem.
     property alias consumesInput: surfaceItem.consumesInput
 
+    // read from outside
+    readonly property bool isFullyOpaque: surface ? surfaceItem.opacity === 1.0 : true
+
     onSurfaceChanged: {
         // Not a binding because animations might remove the surface from the surfaceItem
         // programatically (in order to signal that a zombie surface is free for deletion),