Unity 8

Merge lp:~aacid/unity8/roundedCorners into lp:unity8

roundedCorners
Merge into trunk

Proposed by Albert Astals Cid on 2016-03-29

Status:	Work in progress
Proposed branch:	lp:~aacid/unity8/roundedCorners
Merge into:	lp:unity8
Diff against target:	617 lines (+305/-78) 15 files modified plugins/Utils/CMakeLists.txt (+1/-0) plugins/Utils/itemculler.cpp (+57/-0) plugins/Utils/itemculler.h (+46/-0) plugins/Utils/plugin.cpp (+2/-0) qml/Stages/ApplicationWindow.qml (+2/-0) qml/Stages/BottomCornerRounder.qml (+58/-0) qml/Stages/DecoratedWindow.qml (+1/-0) qml/Stages/DesktopStage.qml (+1/-0) qml/Stages/Splash.qml (+87/-76) qml/Stages/SurfaceContainer.qml (+14/-0) tests/mocks/Unity/Application/CMakeLists.txt (+4/-0) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+23/-0) tests/mocks/Unity/Application/MirSurfaceItem.h (+6/-2) tests/mocks/Utils/CMakeLists.txt (+1/-0) tests/mocks/Utils/plugin.cpp (+2/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/roundedCorners
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-05-19
Lukáš Tinkl (community)		2016-03-29	Needs Fixing on 2016-03-29
Review via email: mp+290290@code.launchpad.net

Commit Message

Introduce bottom rounded corners

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
Yes
https://code.launchpad.net/~aacid/unity-api/mirSurfaceItemIsAlwaysTextureProvider/+merge/290288
https://code.launchpad.net/~aacid/qtmir/mirSurfaceItemIsAlwaysTextureProvider/+merge/290289
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1563320

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

* Did you make sure that your branch does not contain spurious tags?
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

lp:~aacid/unity8/roundedCorners updated on 2016-03-29

2314. By Albert Astals Cid on 2016-03-29: no rounded corners for fullscreen either

Lukáš Tinkl (lukas-kde) wrote on 2016-03-29:

Generally works and looks well, except one minor glitch:
the corners are not initially rounded at startup, only slightly later when the window gains the inner surface

review: Needs Fixing

lp:~aacid/unity8/roundedCorners updated on 2016-03-29

2315. By Albert Astals Cid on 2016-03-29

Make the Splash also respect rounded corners

Creates an extra temporary texture to draw the Splash but should not be very problematic (hopefully)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-29:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-29:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-03-29:

In qml/Stages/BottomCornerRounder.qml, there's a copy-and-paste leftover:

"""
+ * Authors: Michael Zanetti <email address hidden>
"""

lp:~aacid/unity8/roundedCorners updated on 2016-03-29

2316. By Albert Astals Cid on 2016-03-29

No need for Authors:

You can check the bzr log

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-29:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-03-30

2317. By Albert Astals Cid on 2016-03-30

Cull the MirSurfaceItem instead of setting it to not visible

We achieve the effect of not rendering it without messing with the visible property that tests and other parts of the chain use (coming occlusion branches)

2318. By Albert Astals Cid on 2016-03-30

a bit more of docu

2319. By Albert Astals Cid on 2016-03-30

log--

2320. By Albert Astals Cid on 2016-03-30

Move to the old code, no need to modify this

2321. By Albert Astals Cid on 2016-03-30

eof

2322. By Albert Astals Cid on 2016-03-30

Move down the layering from Splash so that it doesn't include the spinner

2323. By Albert Astals Cid on 2016-03-30

eof

2324. By Albert Astals Cid on 2016-03-30

typos-=2

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-30:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-30:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-04-12

2325. By Albert Astals Cid on 2016-04-12: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-12:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-04-26

2326. By Albert Astals Cid on 2016-04-26: Merge (still broken, needs work)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-26:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-04-26

2327. By Albert Astals Cid on 2016-04-26: Fix m_shaderEffectSource sizing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-26:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-26:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-05-02

2328. By Albert Astals Cid on 2016-05-02: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-02:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-05-18

2329. By Albert Astals Cid on 2016-05-18: better math to get a corner with the radius we asked for

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-18:

PASSED: Continuous integration, rev:2329
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1239/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/773
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/773
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1670
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1620
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1620
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1613/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1613/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1613/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1613/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1613/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1613
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1613/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp:~aacid/unity8/roundedCorners updated on 2016-05-19

2330. By Albert Astals Cid on 2016-05-19: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-19:

PASSED: Continuous integration, rev:2330
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1248/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/784
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/784
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1682
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1625/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1625/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1625/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1625/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1625/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1625
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1625/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-05-23:

It looks a bit weird as of now when moving the windows, i think it has to do with the windows not being pixel aligned, i'll wait for lp:~dandrader/unity8/pixelAlignedWindow to land to give it another try.

lp:~aacid/unity8/roundedCorners updated on 2016-06-29

2331. By Albert Astals Cid on 2016-06-02: Merge
2332. By Albert Astals Cid on 2016-06-29: Merge

Unmerged revisions

2332. By Albert Astals Cid on 2016-06-29: Merge
2331. By Albert Astals Cid on 2016-06-02: Merge
2330. By Albert Astals Cid on 2016-05-19: Merge
2329. By Albert Astals Cid on 2016-05-18: better math to get a corner with the radius we asked for
2328. By Albert Astals Cid on 2016-05-02: Merge
2327. By Albert Astals Cid on 2016-04-26: Fix m_shaderEffectSource sizing
2326. By Albert Astals Cid on 2016-04-26: Merge (still broken, needs work)
2325. By Albert Astals Cid on 2016-04-12: Merge
2324. By Albert Astals Cid on 2016-03-30: typos-=2
2323. By Albert Astals Cid on 2016-03-30: eof

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2016-06-27 18:45:27 +0000
 +++ plugins/Utils/CMakeLists.txt	2016-06-29 11:39:03 +0000
@@ -28,6 +28,7 @@
      timezoneFormatter.cpp
      inputeventgenerator.cpp
      deviceconfigparser.cpp
++    itemculler.cpp
      globalfunctions.cpp
      plugin.cpp
+     )
 === added file 'plugins/Utils/itemculler.cpp'
 --- plugins/Utils/itemculler.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/itemculler.cpp	2016-06-29 11:39:03 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "itemculler.h"
++
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-pedantic"
++#include <private/qquickitem_p.h>
++#pragma GCC diagnostic pop
++
++ItemCuller::ItemCuller(QObject *parent)
++    : QObject(parent)
++{
++}
++
++ItemCuller::~ItemCuller()
++{
++    if (m_target) {
++        QQuickItemPrivate::get(m_target)->setCulled(false);
++    }
++}
++
++QQuickItem *ItemCuller::target() const
++{
++    return m_target;
++}
++
++void ItemCuller::setTarget(QQuickItem *value)
++{
++    if (m_target == value) {
++        return;
++    }
++
++    if (m_target) {
++        QQuickItemPrivate::get(m_target)->setCulled(false);
++    }
++
++    m_target = value;
++    if (m_target) {
++        QQuickItemPrivate::get(m_target)->setCulled(true);
++    }
++
++    Q_EMIT targetChanged(value);
++}
 === added file 'plugins/Utils/itemculler.h'
 --- plugins/Utils/itemculler.h	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/itemculler.h	2016-06-29 11:39:03 +0000
@@ -0,0 +1,46 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef ITEMCULLER_H
++#define ITEMCULLER_H
++
++#include <QObject>
++#include <QPointer>
++
++class QQuickItem;
++
++// Culls an item, i.e. excludes it from the rendering process
++// without changing the visible property
++class ItemCuller : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QQuickItem* target READ target WRITE setTarget NOTIFY targetChanged)
++
++public:
++    ItemCuller(QObject *parent = nullptr);
++    ~ItemCuller();
++
++    QQuickItem *target() const;
++    void setTarget(QQuickItem *value);
++
++Q_SIGNALS:
++    void targetChanged(QQuickItem *value);
++
++private:
++    QPointer<QQuickItem> m_target;
++};
++
++#endif
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
 +++ plugins/Utils/plugin.cpp	2016-06-29 11:39:03 +0000
@@ -37,6 +37,7 @@
  #include "applicationsfiltermodel.h"
  #include "inputeventgenerator.h"
  #include "deviceconfigparser.h"
++#include "itemculler.h"
  #include "globalfunctions.h"
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -79,5 +80,6 @@
      qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
      qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
      qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
++    qmlRegisterType<ItemCuller>(uri, 0, 1, "ItemCuller");
      qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
+ }
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2016-06-02 12:02:35 +0000
 +++ qml/Stages/ApplicationWindow.qml	2016-06-29 11:39:03 +0000
@@ -46,6 +46,7 @@
      property alias resizeSurface: surfaceContainer.resizeSurface
      property int requestedWidth: -1
      property int requestedHeight: -1
++    property alias roundedBottomCorners: surfaceContainer.roundedBottomCorners
      readonly property int minimumWidth: surface ? surface.minimumWidth : 0
      readonly property int minimumHeight: surface ? surface.minimumHeight : 0
@@ -184,6 +185,7 @@
                  backgroundColor: d.splashColor
                  headerColor: d.splashColorHeader
                  footerColor: d.splashColorFooter
++                roundedBottomCorners: root.roundedBottomCorners
+             }
+         }
+     }
 === added file 'qml/Stages/BottomCornerRounder.qml'
 --- qml/Stages/BottomCornerRounder.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stages/BottomCornerRounder.qml	2016-06-29 11:39:03 +0000
@@ -0,0 +1,58 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++import QtQuick 2.4
++import Utils 0.1
++
++ShaderEffect {
++    blending: false
++
++    property variant textureItem: undefined
++    property variant radius: units.gu(0.5)
++
++    fragmentShader: "
++    uniform sampler2D textureItem;
++    uniform highp float width;
++    uniform highp float height;
++    uniform highp float radius;
++    varying highp vec2 qt_TexCoord0;
++
++    void main()
++    {
++        highp vec2 point = vec2(qt_TexCoord0.x * width, qt_TexCoord0.y * height);
++
++        highp vec2 bottomLeftCircleCenter = vec2(radius, height - radius);
++        if ((point.x < bottomLeftCircleCenter.x) && (point.y >= bottomLeftCircleCenter.y)) {
++            highp float dist = distance(point, bottomLeftCircleCenter);
++            if (dist >= radius - 1.0) {
++                discard;
++            }
++        } else {
++            highp vec2 bottomRightCircleCenter = vec2(width - radius, height - radius);
++            if ((point.x > bottomRightCircleCenter.x) && (point.y >= bottomRightCircleCenter.y)) {
++                highp float dist = distance(point, bottomRightCircleCenter);
++                if (dist >= radius - 1.0) {
++                    discard;
++                }
++            }
++        }
++
++        highp vec4 c = texture2D(textureItem, qt_TexCoord0);
++        gl_FragColor = c;
++    }
++    "
++}
 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2016-06-20 10:31:44 +0000
 +++ qml/Stages/DecoratedWindow.qml	2016-06-29 11:39:03 +0000
@@ -51,6 +51,7 @@
      readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
      property alias overlayShown: decoration.overlayShown
++    property alias roundedBottomCorners: applicationWindow.roundedBottomCorners
      signal closeClicked()
      signal maximizeClicked()
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-06-27 18:44:07 +0000
 +++ qml/Stages/DesktopStage.qml	2016-06-29 11:39:03 +0000
@@ -669,6 +669,7 @@
                      surface: model.surface
                      active: appDelegate.focus
                      focus: true
++                    roundedBottomCorners: !appDelegate.maximized && !appDelegate.fullscreen
                      maximizeButtonShown: (maximumWidth == 0 || maximumWidth >= appContainer.width) &&
                                           (maximumHeight == 0 || maximumHeight >= appContainer.height)
                      overlayShown: touchControls.overlayShown
 === modified file 'qml/Stages/Splash.qml'
 --- qml/Stages/Splash.qml	2016-05-19 15:22:34 +0000
 +++ qml/Stages/Splash.qml	2016-06-29 11:39:03 +0000
@@ -31,6 +31,7 @@
      property url icon
      property alias title: header.title
      property alias showHeader: header.visible
++    property bool roundedBottomCorners: false
      Ambiance.Palette {
          id: ambiancePalette
@@ -49,84 +50,94 @@
          readonly property bool showIcon: overlaidImage.status == Image.Null && !root.showHeader
+     }
--    StyledItem {
--        id: styledItem
++    Item {
++        id: staticContentItem
          anchors.fill: parent
--        // mimic API of toolkit's MainView component required by MainViewStyle
--        property color backgroundColor: Qt.colorEqual(root.backgroundColor, d.undefinedColor) ? d.defaultBackgroundColor
--                                                                                              : root.backgroundColor
--        property color headerColor: Qt.colorEqual(root.headerColor, d.undefinedColor) ? styledItem.backgroundColor
--                                                                                      : root.headerColor
--        property color footerColor: Qt.colorEqual(root.footerColor, d.undefinedColor) ? styledItem.backgroundColor
--                                                                                      : root.footerColor
--
--        // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
--        readonly property var fakeTheme: QtObject {
--            property string name
--            property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
--                                                          import Ubuntu.Components.Themes.%1 1.3;\
--                                                          Palette {}".arg(styledItem.fakeTheme.name),
--                                                         styledItem, "dynamicPalette");
--        }
--
--        // FIXME: should instead use future toolkit API:
--        // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
--        style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
--    }
--
--    PageHeader {
--        id: header
--        anchors { left: parent.left; right: parent.right }
--        StyleHints {
--            foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
--            backgroundColor: "transparent"
--            dividerColor: styledItem.fakeTheme.palette.normal.base
--        }
--    }
--
--    Image {
--        id: overlaidImage
--        anchors.centerIn: parent
--        anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
--        sourceSize {
--            width: root.width
--            height: root.height
--        }
--        asynchronous: true
--        cache: false
--    }
--
--    UbuntuShape {
--        id: iconShape
--        anchors.horizontalCenter: parent.horizontalCenter
--        anchors.verticalCenter: parent.verticalCenter
--        anchors.verticalCenterOffset: -units.gu(4)
--        width: units.gu(8)
--        height: units.gu(7.5)
--
--        visible: d.showIcon
--
--        radius: "medium"
--        aspect: UbuntuShape.Flat
--        sourceFillMode: Image.PreserveAspectCrop
--        source: Image {
--            id: iconImage
--            sourceSize.width: iconShape.width
--            sourceSize.height: iconShape.height
--            source: d.showIcon ? root.icon : ""
--        }
--    }
--
--    Label {
--        text: root.title
--        anchors.horizontalCenter: parent.horizontalCenter
--        anchors.top: iconShape.bottom
--        anchors.topMargin: units.gu(2)
--        fontSize: "large"
--
--        color: styledItem.fakeTheme.palette.normal.backgroundText
--        visible: d.showIcon
++        StyledItem {
++            id: styledItem
++            anchors.fill: parent
++
++            // mimic API of toolkit's MainView component required by MainViewStyle
++            property color backgroundColor: Qt.colorEqual(root.backgroundColor, d.undefinedColor) ? d.defaultBackgroundColor
++                                                                                                : root.backgroundColor
++            property color headerColor: Qt.colorEqual(root.headerColor, d.undefinedColor) ? styledItem.backgroundColor
++                                                                                        : root.headerColor
++            property color footerColor: Qt.colorEqual(root.footerColor, d.undefinedColor) ? styledItem.backgroundColor
++                                                                                        : root.footerColor
++
++            // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
++            readonly property var fakeTheme: QtObject {
++                property string name
++                property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
++                                                            import Ubuntu.Components.Themes.%1 1.3;\
++                                                            Palette {}".arg(styledItem.fakeTheme.name),
++                                                            styledItem, "dynamicPalette");
++            }
++
++            // FIXME: should instead use future toolkit API:
++            // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
++            style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
++        }
++
++        PageHeader {
++            id: header
++            anchors { left: parent.left; right: parent.right }
++            StyleHints {
++                foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
++                backgroundColor: "transparent"
++                dividerColor: styledItem.fakeTheme.palette.normal.base
++            }
++        }
++
++        Image {
++            id: overlaidImage
++            anchors.centerIn: parent
++            anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
++            sourceSize {
++                width: root.width
++                height: root.height
++            }
++            asynchronous: true
++            cache: false
++        }
++
++        UbuntuShape {
++            id: iconShape
++            anchors.horizontalCenter: parent.horizontalCenter
++            anchors.verticalCenter: parent.verticalCenter
++            anchors.verticalCenterOffset: -units.gu(4)
++            width: units.gu(8)
++            height: units.gu(7.5)
++
++            visible: d.showIcon
++
++            radius: "medium"
++            aspect: UbuntuShape.Flat
++            sourceFillMode: Image.PreserveAspectCrop
++            source: Image {
++                id: iconImage
++                sourceSize.width: iconShape.width
++                sourceSize.height: iconShape.height
++                source: d.showIcon ? root.icon : ""
++            }
++        }
++
++        Label {
++            text: root.title
++            anchors.horizontalCenter: parent.horizontalCenter
++            anchors.top: iconShape.bottom
++            anchors.topMargin: units.gu(2)
++            fontSize: "large"
++
++            color: styledItem.fakeTheme.palette.normal.backgroundText
++            visible: d.showIcon
++        }
++
++        layer.enabled: root.roundedBottomCorners
++        layer.effect: BottomCornerRounder {
++            textureItem: staticContentItem
++        }
+     }
      Timer {
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2016-05-18 21:58:39 +0000
 +++ qml/Stages/SurfaceContainer.qml	2016-06-29 11:39:03 +0000
@@ -37,6 +37,7 @@
      // FIME - dont export, use interactive property. Need to fix qtmir to handle consumesInputChanged
      // to update surface activeFocus. See mock MirSurfaceItem.
      property alias consumesInput: surfaceItem.consumesInput
++    property bool roundedBottomCorners: false
      onSurfaceChanged: {
          // Not a binding because animations might remove the surface from the surfaceItem
@@ -93,6 +94,19 @@
          orientationAngle: root.surfaceOrientationAngle
+     }
++    Loader {
++        anchors.fill: surfaceItem
++        active: root.roundedBottomCorners && surfaceItem.visible
++
++        sourceComponent: BottomCornerRounder {
++            textureItem: surfaceItem
++
++            ItemCuller {
++                target: surfaceItem
++            }
++        }
++    }
++
      TouchGate {
          targetItem: surfaceItem
          anchors.fill: root
 === modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
 --- tests/mocks/Unity/Application/CMakeLists.txt	2016-04-04 13:37:49 +0000
 +++ tests/mocks/Unity/Application/CMakeLists.txt	2016-06-29 11:39:03 +0000
@@ -1,3 +1,7 @@
++include_directories(
++    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
++)
++
  set(FakeUnityApplicationQml_SOURCES
      plugin.cpp
      ApplicationInfo.cpp
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-05-26 13:15:35 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-06-29 11:39:03 +0000
@@ -42,6 +42,7 @@
      , m_qmlSurface(nullptr)
      , m_qmlContentComponent(nullptr)
      , m_qmlItem(nullptr)
++    , m_shaderEffectSource(this)
      , m_consumesInput(false)
      , m_surfaceWidth(0)
      , m_surfaceHeight(0)
@@ -62,6 +63,8 @@
      connect(this, &MirSurfaceItem::consumesInputChanged, this, [this]() {
          updateMirSurfaceActiveFocus(hasActiveFocus());
      });
++
++    m_shaderEffectSource.setHideSource(true);
+ }
  MirSurfaceItem::~MirSurfaceItem()
@@ -168,6 +171,8 @@
      m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
      m_qmlItem->setParentItem(this);
++    m_shaderEffectSource.setSourceItem(m_qmlItem);
++
      setImplicitWidth(m_qmlItem->implicitWidth());
      setImplicitHeight(m_qmlItem->implicitHeight());
@@ -233,6 +238,8 @@
+     }
      if (m_qmlSurface) {
++        m_shaderEffectSource.setSourceItem(nullptr);
++
          delete m_qmlItem;
          m_qmlItem = nullptr;
@@ -301,6 +308,15 @@
+     }
+ }
++void MirSurfaceItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
++{
++    unity::shell::application::MirSurfaceItemInterface::geometryChanged(newGeometry, oldGeometry);
++    if (newGeometry != oldGeometry) {
++        m_shaderEffectSource.setWidth(newGeometry.width());
++        m_shaderEffectSource.setHeight(newGeometry.height());
++    }
++}
++
  void MirSurfaceItem::updateMirSurfaceVisibility()
+ {
      if (!m_qmlSurface) return;
@@ -358,3 +374,10 @@
          Q_EMIT fillModeChanged(m_fillMode);
+     }
+ }
++
++QSGTextureProvider *MirSurfaceItem::textureProvider() const
++{
++    // This is so that the fake MirSurfaceItem is a texture provider
++    // the real qtmir is already one without the need for extra layering
++    return m_shaderEffectSource.textureProvider();
++}
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
 --- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-05-09 08:54:11 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.h	2016-06-29 11:39:03 +0000
@@ -25,6 +25,8 @@
  // unity-api
  #include <unity/shell/application/MirSurfaceItemInterface.h>
++#include <private/qquickshadereffectsource_p.h>
++
  class MirSurfaceItem : public unity::shell::application::MirSurfaceItemInterface
+ {
      Q_OBJECT
@@ -70,11 +72,11 @@
      FillMode fillMode() const override { return m_fillMode; }
      void setFillMode(FillMode value) override;
++    QSGTextureProvider *textureProvider() const override;
++
      /////
      // For use in qml tests
--    void setLive(bool live);
--
      int touchPressCount() const { return m_touchPressCount; }
      void setTouchPressCount(int count) { m_touchPressCount = count; Q_EMIT touchPressCountChanged(count); }
@@ -98,6 +100,7 @@
      void mousePressEvent(QMouseEvent * event) override;
      void mouseMoveEvent(QMouseEvent * event) override;
      void mouseReleaseEvent(QMouseEvent * event) override;
++    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
  private Q_SLOTS:
      void onComponentStatusChanged(QQmlComponent::Status status);
@@ -114,6 +117,7 @@
      QQmlComponent *m_qmlContentComponent;
      QQuickItem *m_qmlItem;
++    QQuickShaderEffectSource m_shaderEffectSource;
      bool m_consumesInput;
 === modified file 'tests/mocks/Utils/CMakeLists.txt'
 --- tests/mocks/Utils/CMakeLists.txt	2016-06-02 09:32:33 +0000
 +++ tests/mocks/Utils/CMakeLists.txt	2016-06-29 11:39:03 +0000
@@ -24,6 +24,7 @@
      ${CMAKE_SOURCE_DIR}/plugins/Utils/inputeventgenerator.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/deviceconfigparser.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/itemculler.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
 === modified file 'tests/mocks/Utils/plugin.cpp'
 --- tests/mocks/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
 +++ tests/mocks/Utils/plugin.cpp	2016-06-29 11:39:03 +0000
@@ -38,6 +38,7 @@
  #include <applicationsfiltermodel.h>
  #include <inputeventgenerator.h>
  #include <deviceconfigparser.h>
++#include <itemculler.h>
  #include <globalfunctions.h>
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -79,5 +80,6 @@
      qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
      qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
      qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
++    qmlRegisterType<ItemCuller>(uri, 0, 1, "ItemCuller");
      qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
+ }