Merge lp:~zsombi/ubuntu-ui-toolkit/fixBottoMEdge into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fix BottomEdge content discarding.

* Once loaded, never discard BottomEdge default region content.
* Fix hint icon size
* Provide PIMPL for BottomEdgeRegion
* Fix flaky test for altered region commit point

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1916
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/593/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2238/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/593/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1916
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/373/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2239/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/373/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1916
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/605/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2240/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/605/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1916
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/348/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2241/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/348/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1916
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/226/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/593
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/605
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/605/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/373
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/348
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2242/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2238
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2240
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2239
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2241

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/226/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

and the hint size is fixed :)

[Tim Peeters (tpeeters)]

When I open the gallery app and go to the bottom edge page, then click the icon in the header to reveal the bottom edge, I only see a semi-transparent overlay, no BE contents. See https://www.dropbox.com/s/kp7jo5tla1mi7m1/Screenshot%20from%202016-04-01%2009-00-35.png?dl=0

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/fixBottoMEdge]

1917. By Zsombor Egri on 2016-04-01

fix Action trigger commit content to be shown

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/606/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2243/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/606/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Works. But jenkins failed on "Slave went offline during the build".

There are two typos in the comments (two times "teh").

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/594/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2244/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/594/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/374/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2245/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/374/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/349/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2246/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/349/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/227/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/594
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/606/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/374
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/349
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2247/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2244
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2243
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2245
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2246

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/227/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/595/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2248/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/595/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/375/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2249/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/375/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/607/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2250/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/607/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/350/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2251/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/350/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/596/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2252/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/596/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/376/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2253/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/376/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/608/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2254/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/608/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/351/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2255/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/351/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1917
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/228/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/596
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/608
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/608/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/376
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/351
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2256/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2252
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2254
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2253
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2255

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/228/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-02-16 11:10:35 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-04-01 13:16:40 +0000
@@ -104,8 +104,8 @@
 
     Icon {
         id: h1
-        width: units.gu(2)
-        height: width
+        width: units.gu(3)
+        height: units.gu(1.5)
         anchors {
             centerIn: parent
             topMargin: styledItem.height

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-03-11 12:16:11 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-04-01 13:16:40 +0000
@@ -116,7 +116,8 @@
     $$PWD/privates/ucpagewrapper_p.h \
     $$PWD/privates/ucpagewrapperincubator_p.h \
     $$PWD/privates/appheaderbase.h \
-    $$PWD/label_p.h
+    $$PWD/label_p.h \
+    $$PWD/ucbottomedgeregion_p.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-03-16 17:20:49 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-04-01 13:16:40 +0000
@@ -19,6 +19,7 @@
 #include "ucbottomedge_p.h"
 #include "ucbottomedgestyle.h"
 #include "ucbottomedgeregion.h"
+#include "ucbottomedgeregion_p.h"
 #include "ucbottomedgehint_p.h"
 #include "ucstyleditembase_p.h"
 #include <QtQml/QQmlEngine>
@@ -43,7 +44,7 @@
 
 UCBottomEdgePrivate::UCBottomEdgePrivate()
     : UCStyledItemBasePrivate()
-    , defaultRegion(new UCBottomEdgeRegion(nullptr, true))
+    , defaultRegion(new DefaultRegion(nullptr))
     , activeRegion(Q_NULLPTR)
     , hint(new UCBottomEdgeHint)
     , bottomPanel(Q_NULLPTR)
@@ -69,12 +70,8 @@
     });
 
     // create default region
-    // for testing purposes
-    defaultRegion->setObjectName("default_BottomEdgeRegion");
     // enters in this stage when drag ratio reaches 30% of the area
-    defaultRegion->m_from = 0.33;
-    defaultRegion->m_to = 1.0;
-    defaultRegion->attachToBottomEdge(q);
+    UCBottomEdgeRegionPrivate::get(defaultRegion)->attachToBottomEdge(q);
 
     QObject::connect(defaultRegion, &UCBottomEdgeRegion::contentChanged,
                      q, &UCBottomEdge::contentChanged);
@@ -133,7 +130,7 @@
     QQml_setParent_noEvent(region, q);
     // take ownership!
     QQmlEngine::setObjectOwnership(region, QQmlEngine::CppOwnership);
-    region->attachToBottomEdge(q);
+    UCBottomEdgeRegionPrivate::get(region)->attachToBottomEdge(q);
 
     if (!defaultRegionsReset) {
         defaultRegionsReset = true;
@@ -143,13 +140,10 @@
     // validate the region before we append
     validateRegion(region);
 
-    // if preload is set, load content
-    if (preloadContent) {
-        region->loadRegionContent();
-    }
-
     // append region definition
     regions.append(region);
+
+    LOG << "region added:" << region;
 }
 
 // clears the custom regions list and restores the default ones
@@ -164,6 +158,8 @@
     regions.clear();
     defaultRegionsReset = false;
     regions.append(defaultRegion);
+
+    LOG << "regions cleared, default restored";
 }
 
 // validates an added region
@@ -172,7 +168,7 @@
     // we should not validate unti the bottom edge is not completed,
     // property changes may invalidate the result of the validation
     // also leave if the region is disabled
-    if (!componentComplete || !region->m_enabled) {
+    if (!componentComplete || !UCBottomEdgeRegionPrivate::get(region)->enabled) {
         return;
     }
     Q_Q(UCBottomEdge);
@@ -187,7 +183,7 @@
     const QRectF regionRect(region->rect(boundingRect));
     for (int i = 0; i < regionsSize; ++i) {
         UCBottomEdgeRegion *stackedRegion = regions[i];
-        if (region == stackedRegion || !stackedRegion->m_enabled) {
+        if (region == stackedRegion || !UCBottomEdgeRegionPrivate::get(stackedRegion)->enabled) {
             continue;
         }
         QRectF rect(stackedRegion->rect(boundingRect));
@@ -197,7 +193,9 @@
             QRectF intersect = regionRect.intersected(stackedRegion->rect(boundingRect));
             if (!intersect.isNull()) {
                 qmlInfo(region) << QString("Region intersects the one from index %1 having from: %2 and to: %3")
-                                   .arg(i).arg(stackedRegion->m_from).arg(stackedRegion->m_to);
+                                   .arg(i)
+                                   .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->from)
+                                   .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->to);
             }
         }
     }
@@ -229,6 +227,11 @@
             break;
         }
     }
+    // if no active region is found, use the default one
+    if (!newActive) {
+        LOG << "no active region found, fall back to the default";
+        newActive = defaultRegion;
+    }
     if (newActive != activeRegion) {
         setActiveRegion(newActive);
     }
@@ -288,15 +291,15 @@
 void UCBottomEdgePrivate::onDragEnded()
 {
     // collapse if we drag downwards, or not in any active region and we did not pass 30% of the BottomEdge height
-    if (dragDirection == UCBottomEdge::Downwards || (!activeRegion && dragProgress < 0.33)) {
+    LOG << "direction:" << dragDirection << ", activeRegion?" << activeRegion << ", dragProgress:" << dragProgress;
+    if (dragDirection == UCBottomEdge::Downwards || (activeRegion && !activeRegion->canCommit(dragProgress))) {
         q_func()->collapse();
-    } else if (!activeRegion && dragProgress >= 0.33) {
-        // commit if we are not in an active region but we passed 30% of the BottomEdge height
-        q_func()->commit();
-    } else if (activeRegion) {
-        // emit region's dragEnded first
-        Q_EMIT activeRegion->dragEnded();
-        commit(activeRegion->m_to);
+    } else {
+        UCBottomEdgeRegion *region = activeRegion ? activeRegion : defaultRegion;
+        if (region->canCommit(dragProgress)) {
+            Q_EMIT region->dragEnded();
+            commit(UCBottomEdgeRegionPrivate::get(region)->to);
+        }
     }
 }
 
@@ -745,9 +748,6 @@
 {
     UCStyledItemBasePrivate::completeComponentInitialization();
     Q_Q(UCBottomEdge);
-    // trigger default region content loading; the default region content is
-    // always pre-loaded
-    defaultRegion->loadRegionContent();
 
     // fix the hint's style version as that has no qmlContext of its own
     // and thus import version check will fail; setting the context for
@@ -957,7 +957,7 @@
 QUrl UCBottomEdge::contentUrl() const
 {
     Q_D(const UCBottomEdge);
-    return d->defaultRegion->m_url;
+    return d->defaultRegion->url();
 }
 void UCBottomEdge::setContent(const QUrl &url)
 {
@@ -973,7 +973,7 @@
 QQmlComponent *UCBottomEdge::contentComponent() const
 {
     Q_D(const UCBottomEdge);
-    return d->defaultRegion->m_component;
+    return d->defaultRegion->component();
 }
 void UCBottomEdge::setContentComponent(QQmlComponent *component)
 {
@@ -1002,6 +1002,11 @@
 void UCBottomEdge::commit()
 {
     Q_D(UCBottomEdge);
+    // make sure that teh default region's content is loaded!
+    if (!d->activeRegion || d->activeRegion == d->defaultRegion) {
+        // make sure teh default is the active region
+        d->setActiveRegion(d->defaultRegion);
+    }
     d->commit(1.0);
 }
 
@@ -1111,17 +1116,14 @@
         // as default one is always preloaded
         for (int i = 0; i < d->regions.size(); i++) {
             UCBottomEdgeRegion *region = d->regions[i];
-            if (region == d->defaultRegion) {
-                continue;
-            }
-            region->loadRegionContent();
+            UCBottomEdgeRegionPrivate::get(region)->loadRegionContent();
         }
     } else {
         // discard all inactive regions content, except default one
         for (int i = 0; i < d->regions.size(); i++) {
             UCBottomEdgeRegion *region = d->regions[i];
-            if (region != d->activeRegion && region != d->defaultRegion) {
-                region->discardRegionContent();
+            if (region != d->activeRegion) {
+                UCBottomEdgeRegionPrivate::get(region)->discardRegionContent();
             }
         }
     }
@@ -1138,11 +1140,11 @@
 {
     QQuickItem *newContent = nullptr;
     if (activeRegion) {
-        newContent = activeRegion->regionContent();
+        newContent = UCBottomEdgeRegionPrivate::get(activeRegion)->contentItem;
         LOG << "ACTIVE REGION CONTENT" << activeRegion->objectName() << newContent;
     }
     if (!newContent) {
-        newContent = defaultRegion->regionContent();
+        newContent = UCBottomEdgeRegionPrivate::get(defaultRegion)->contentItem;
         LOG << "USING DEFAULT" << newContent;
     }
     resetCurrentContent(newContent);
@@ -1164,7 +1166,7 @@
 
     if (!newContent) {
         // try to use the default one
-        newContent = defaultRegion->regionContent();
+        newContent = UCBottomEdgeRegionPrivate::get(defaultRegion)->contentItem;
     }
 
     // if it is still null, leave - we may not have default content at all!

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2016-02-20 15:11:02 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2016-04-01 13:16:40 +0000
@@ -19,9 +19,31 @@
 #include "ucbottomedge.h"
 #include "ucbottomedge_p.h"
 #include "ucbottomedgeregion.h"
+#include "ucbottomedgeregion_p.h"
 #include "propertychange_p.h"
 #include <QtQml/private/qqmlproperty_p.h>
 
+
+UCBottomEdgeRegionPrivate::UCBottomEdgeRegionPrivate()
+    : QObjectPrivate()
+    , bottomEdge(Q_NULLPTR)
+    , component(Q_NULLPTR)
+    , contentItem(Q_NULLPTR)
+    , from(0.0)
+    , to(-1.0)
+    , enabled(true)
+    , active(false)
+{
+}
+
+void UCBottomEdgeRegionPrivate::init()
+{
+    Q_Q(UCBottomEdgeRegion);
+    bottomEdge = qobject_cast<UCBottomEdge*>(parent);
+    QObject::connect(&loader, SIGNAL(loadingStatus(AsyncLoader::LoadingStatus,QObject*)),
+            q, SLOT(onLoaderStatusChanged(AsyncLoader::LoadingStatus,QObject*)));
+}
+
 /*!
  * \qmltype BottomEdgeRegion
  * \instantiates UCBottomEdgeRegion
@@ -91,131 +113,141 @@
  * properties will cause unpredictable results.
  */
 
-UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent, bool isDefault)
-    : QObject(parent)
-    , m_bottomEdge(qobject_cast<UCBottomEdge*>(parent))
-    , m_component(Q_NULLPTR)
-    , m_contentItem(Q_NULLPTR)
-    , m_from(0.0)
-    , m_to(-1.0)
-    , m_enabled(true)
-    , m_active(false)
-    , m_default(isDefault)
-{
-    connect(&m_loader, &UbuntuToolkit::AsyncLoader::loadingStatus,
-            this, &UCBottomEdgeRegion::onLoaderStatusChanged);
-}
-
-void UCBottomEdgeRegion::attachToBottomEdge(UCBottomEdge *bottomEdge)
-{
-    QQml_setParent_noEvent(this, bottomEdge);
-    m_bottomEdge = bottomEdge;
+UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent)
+    : QObject(*(new UCBottomEdgeRegionPrivate), parent)
+{
+    d_func()->init();
+}
+
+UCBottomEdgeRegion::UCBottomEdgeRegion(UCBottomEdgeRegionPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+    d_func()->init();
+}
+
+void UCBottomEdgeRegionPrivate::attachToBottomEdge(UCBottomEdge *bottomEdge)
+{
+    Q_Q(UCBottomEdgeRegion);
+    QQml_setParent_noEvent(q, bottomEdge);
+    this->bottomEdge = bottomEdge;
     // adjust to property value if not set yet
-    if (m_to <= 0.0) {
-        m_to = 1.0;
-        Q_EMIT toChanged();
+    if (to <= 0.0) {
+        to = 1.0;
+        Q_EMIT q->toChanged();
+    }
+
+    // if preload is set, load content
+    if (bottomEdge->preloadContent()) {
+        loadRegionContent();
     }
 }
 
 bool UCBottomEdgeRegion::contains(qreal dragRatio)
 {
-    return (m_enabled && (m_from < m_to) && dragRatio >= m_from && dragRatio <= m_to);
+    Q_D(UCBottomEdgeRegion);
+    return (d->enabled && (d->from < d->to) && dragRatio >= d->from && dragRatio <= d->to);
+}
+
+// Called when drag ends to check whether content can be committed. The default
+// implementation returns true.
+bool UCBottomEdgeRegion::canCommit(qreal dragRatio)
+{
+    Q_UNUSED(dragRatio);
+    return true;
 }
 
 void UCBottomEdgeRegion::enter()
 {
-    m_active = true;
+    Q_D(UCBottomEdgeRegion);
+    d->active = true;
     Q_EMIT entered();
 
     LOG << "ENTER REGION" << objectName();
     // if preloaded, or default(?), set the content
-    if (m_bottomEdge->preloadContent() || m_default) {
-        if (m_loader.status() == UbuntuToolkit::AsyncLoader::Ready) {
+    if (d->bottomEdge->preloadContent()) {
+        if (d->loader.status() == UbuntuToolkit::AsyncLoader::Ready) {
             LOG << "SET REGION CONTENT" << objectName();
-            UCBottomEdgePrivate::get(m_bottomEdge)->setCurrentContent();
+            UCBottomEdgePrivate::get(d->bottomEdge)->setCurrentContent();
         }
     } else {
         // initiate loading, component has priority
-        loadRegionContent();
+        d->loadRegionContent();
     }
 }
 
 void UCBottomEdgeRegion::exit()
 {
-    m_active = false;
+    Q_D(UCBottomEdgeRegion);
+    d->active = false;
     Q_EMIT exited();
 
     // detach content from BottomEdge
     LOG << "EXIT REGION" << objectName();
-    UCBottomEdgePrivate::get(m_bottomEdge)->resetCurrentContent(nullptr);
+    UCBottomEdgePrivate::get(d->bottomEdge)->resetCurrentContent(nullptr);
 
     // then cleanup
-    if (!m_contentItem) {
+    if (!d->contentItem) {
         return;
     }
     LOG << "RESET REGION CONTENT" << objectName();
-    if (!m_bottomEdge->preloadContent()) {
+    if (!d->bottomEdge->preloadContent()) {
         LOG << "DISCARD REGION CONTENT" << objectName();
-        discardRegionContent();
+        d->discardRegionContent();
     }
 }
 
 const QRectF UCBottomEdgeRegion::rect(const QRectF &bottomEdgeRect)
 {
+    Q_D(UCBottomEdgeRegion);
     QRectF regionRect(
-                bottomEdgeRect.topLeft() + QPointF(0, bottomEdgeRect.height() * (1.0 - m_to)),
-                QSizeF(bottomEdgeRect.width(), bottomEdgeRect.height() * (m_to - m_from)));
+                bottomEdgeRect.topLeft() + QPointF(0, bottomEdgeRect.height() * (1.0 - d->to)),
+                QSizeF(bottomEdgeRect.width(), bottomEdgeRect.height() * (d->to - d->from)));
     return regionRect;
 }
 
-void UCBottomEdgeRegion::loadRegionContent()
+void UCBottomEdgeRegionPrivate::loadRegionContent()
 {
-    if (!m_enabled) {
+    if (!enabled) {
         return;
     }
-    LOG << "LOAD REGION CONTENT" << objectName();
-    if (m_component) {
+    LOG << "LOAD REGION CONTENT" << q_func()->objectName() << contentItem;
+    if (component) {
         loadContent(LoadingComponent);
-    } else if (m_url.isValid()) {
+    } else if (url.isValid()) {
         loadContent(LoadingUrl);
     }
 }
 
-void UCBottomEdgeRegion::loadContent(LoadingType type)
+void UCBottomEdgeRegionPrivate::loadContent(LoadingType type)
 {
     // we must delete the previous content before we (re)initiate loading
-    if (m_contentItem) {
-        m_contentItem->deleteLater();;
-        m_contentItem = nullptr;
+    if (contentItem) {
+        contentItem->deleteLater();;
+        contentItem = nullptr;
     }
     // no need to create new context as we do not set any context properties
     // for which we would need one
     switch (type) {
     case LoadingUrl:
-        m_loader.load(m_url, qmlContext(m_bottomEdge));
+        loader.load(url, qmlContext(bottomEdge));
         return;
     case LoadingComponent:
-        m_loader.load(m_component, qmlContext(m_bottomEdge));
+        loader.load(component, qmlContext(bottomEdge));
         return;
     }
 }
 
-void UCBottomEdgeRegion::discardRegionContent()
+void UCBottomEdgeRegionPrivate::discardRegionContent()
 {
-    m_loader.reset();
-    if (m_contentItem) {
-        LOG << "DISCARD CONTENT" << objectName();
-        m_contentItem->deleteLater();
+    loader.reset();
+    if (contentItem) {
+        LOG << "DISCARD CONTENT" << q_func()->objectName();
+        contentItem->deleteLater();
     }
-    m_contentItem = nullptr;
-}
-
-QQuickItem *UCBottomEdgeRegion::regionContent()
-{
-    return m_contentItem;
-}
-
-void UCBottomEdgeRegion::onLoaderStatusChanged(UbuntuToolkit::AsyncLoader::LoadingStatus status, QObject *object)
+    contentItem = nullptr;
+}
+
+void UCBottomEdgeRegionPrivate::onLoaderStatusChanged(AsyncLoader::LoadingStatus status, QObject *object)
 {
     bool emitChange = false;
     LOG << "STATUS" << status << object;
@@ -223,28 +255,28 @@
         // if we are no longer active, no need to continue, and discard content
         // this may occur when the component was still in Compiling state while
         // the region was exited, therefore reset() could not cancel the operation.
-        if (!m_active && !m_default && !m_bottomEdge->preloadContent()) {
-            LOG << "DELETE REGION CONTENT" << objectName();
+        if (!active && !bottomEdge->preloadContent()) {
+            LOG << "DELETE REGION CONTENT" << q_func()->objectName();
             object->deleteLater();
             return;
         }
-        m_contentItem = qobject_cast<QQuickItem*>(object);
-        emitChange = m_active || m_default;
+        contentItem = qobject_cast<QQuickItem*>(object);
+        emitChange = active;
     }
 
     if (status == UbuntuToolkit::AsyncLoader::Reset) {
         // de-parent first
-        if (m_contentItem) {
-            m_contentItem->setParentItem(nullptr);
-            LOG << "RESET CONTENT" << objectName();
-            m_contentItem->deleteLater();
+        if (contentItem) {
+            contentItem->setParentItem(nullptr);
+            LOG << "RESET CONTENT" << q_func()->objectName();
+            contentItem->deleteLater();
         }
-        m_contentItem = nullptr;
+        contentItem = nullptr;
         emitChange = true;
     }
 
-    if (emitChange && m_bottomEdge && m_active) {
-        UCBottomEdgePrivate::get(m_bottomEdge)->setCurrentContent();
+    if (emitChange && bottomEdge && active) {
+        UCBottomEdgePrivate::get(bottomEdge)->setCurrentContent();
     }
 }
 
@@ -253,24 +285,30 @@
  * Enables the section. Disabled sections do not trigger nor change the BottomEdge
  * content. Defaults to false.
  */
+bool UCBottomEdgeRegion::enabled() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->enabled;
+}
 void UCBottomEdgeRegion::setEnabled(bool enabled)
 {
-    if (enabled == m_enabled) {
+    Q_D(UCBottomEdgeRegion);
+    if (enabled == d->enabled) {
         return;
     }
-    m_enabled = enabled;
-    if (m_bottomEdge) {
-        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    d->enabled = enabled;
+    if (d->bottomEdge) {
+        UCBottomEdgePrivate::get(d->bottomEdge)->validateRegion(this);
+        // load content if preload is set
+        if (d->bottomEdge->preloadContent()) {
+            if (!d->enabled) {
+                d->discardRegionContent();
+            } else {
+                d->loadRegionContent();
+            }
+        }
     }
 
-    // load content if preload is set
-    if (m_bottomEdge->preloadContent()) {
-        if (!m_enabled) {
-            discardRegionContent();
-        } else {
-            loadRegionContent();
-        }
-    }
     Q_EMIT enabledChanged();
 }
 
@@ -279,14 +317,20 @@
  * Specifies the starting ratio of the bottom erge area. The value must be bigger
  * or equal to 0 but strictly smaller than \l to. Defaults to 0.0.
  */
+qreal UCBottomEdgeRegion::from() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->from;
+}
 void UCBottomEdgeRegion::setFrom(qreal from)
 {
-    if (from == m_from) {
+    Q_D(UCBottomEdgeRegion);
+    if (from == d->from) {
         return;
     }
-    m_from = from;
-    if (m_bottomEdge) {
-        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    d->from = from;
+    if (d->bottomEdge) {
+        UCBottomEdgePrivate::get(d->bottomEdge)->validateRegion(this);
     }
     Q_EMIT fromChanged();
 }
@@ -299,14 +343,20 @@
  * will result in exposing the bottom edge content only till the ration specified
  * by this property.
  */
+qreal UCBottomEdgeRegion::to() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->to;
+}
 void UCBottomEdgeRegion::setTo(qreal to)
 {
-    if (to == m_to) {
+    Q_D(UCBottomEdgeRegion);
+    if (to == d->to) {
         return;
     }
-    m_to = to;
-    if (m_bottomEdge) {
-        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    d->to = to;
+    if (d->bottomEdge) {
+        UCBottomEdgePrivate::get(d->bottomEdge)->validateRegion(this);
     }
     Q_EMIT toChanged();
 }
@@ -318,16 +368,22 @@
  * when the drag gesture enters the section area. The orginal value will be restored
  * once the gesture leaves the section area.
  */
+QUrl UCBottomEdgeRegion::url() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->url;
+}
 void UCBottomEdgeRegion::setUrl(const QUrl &url)
 {
-    if (m_url == url) {
+    Q_D(UCBottomEdgeRegion);
+    if (d->url == url) {
         return;
     }
-    m_url = url;
-    Q_EMIT contentChanged(m_url);
+    d->url = url;
+    Q_EMIT contentChanged(d->url);
     // invoke loader if the preload is set
-    if (m_bottomEdge && (m_bottomEdge->preloadContent() || m_default) && !m_url.isValid()) {
-        loadContent(LoadingUrl);
+    if (d->bottomEdge && (d->bottomEdge->preloadContent()) && !d->url.isValid()) {
+        d->loadContent(UCBottomEdgeRegionPrivate::LoadingUrl);
     }
 }
 
@@ -338,16 +394,22 @@
  * when the drag gesture enters the section area. The orginal value will be restored
  * once the gesture leaves the section area.
  */
+QQmlComponent *UCBottomEdgeRegion::component() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->component;
+}
 void UCBottomEdgeRegion::setComponent(QQmlComponent *component)
 {
-    if (m_component == component) {
+    Q_D(UCBottomEdgeRegion);
+    if (d->component == component) {
         return;
     }
-    m_component = component;
-    Q_EMIT contentComponentChanged(m_component);
+    d->component = component;
+    Q_EMIT contentComponentChanged(d->component);
     // invoke loader if the preload is set
-    if (m_bottomEdge && (m_bottomEdge->preloadContent() || m_default) && m_component) {
-        loadContent(LoadingComponent);
+    if (d->bottomEdge && d->bottomEdge->preloadContent() && d->component) {
+        d->loadContent(UCBottomEdgeRegionPrivate::LoadingComponent);
     }
 }
 
@@ -366,3 +428,40 @@
  * \qmlsignal void BottomEdgeRegion::dragEnded()
  * Signal triggered when the drag ends within the active bottom edge section area.
  */
+
+// default region
+
+DefaultRegionPrivate::DefaultRegionPrivate()
+{
+}
+
+void DefaultRegionPrivate::loadRegionContent()
+{
+    if (contentItem) {
+        LOG << "region content loaded, return";
+        return;
+    }
+    UCBottomEdgeRegionPrivate::loadRegionContent();
+}
+
+void DefaultRegionPrivate::discardRegionContent()
+{
+    // do nothing, do not cleanup the content!
+    LOG << "suppress region discarding!";
+}
+
+DefaultRegion::DefaultRegion(UCBottomEdge *parent)
+    : UCBottomEdgeRegion(*(new DefaultRegionPrivate), parent)
+{
+    UCBottomEdgeRegionPrivate *d = UCBottomEdgeRegionPrivate::get(this);
+    d->from = 0.0;
+    d->to = 1.0;
+    setObjectName("default_BottomEdgeRegion");
+}
+
+bool DefaultRegion::canCommit(qreal dragRatio)
+{
+    return (dragRatio >= 0.33);
+}
+
+#include "moc_ucbottomedgeregion.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.h'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion.h	2016-02-20 15:11:02 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion.h	2016-04-01 13:16:40 +0000
@@ -29,46 +29,39 @@
 class UCBottomEdge;
 class QQmlComponent;
 class PropertyChange;
+class UCBottomEdgeRegionPrivate;
 class UCBottomEdgeRegion : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(bool enabled MEMBER m_enabled WRITE setEnabled NOTIFY enabledChanged FINAL)
-    Q_PROPERTY(qreal from MEMBER m_from WRITE setFrom NOTIFY fromChanged FINAL)
-    Q_PROPERTY(qreal to MEMBER m_to WRITE setTo NOTIFY toChanged FINAL)
-    Q_PROPERTY(QUrl contentUrl MEMBER m_url WRITE setUrl NOTIFY contentChanged FINAL)
-    Q_PROPERTY(QQmlComponent* contentComponent MEMBER m_component WRITE setComponent NOTIFY contentComponentChanged FINAL)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged FINAL)
+    Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
+    Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged FINAL)
+    Q_PROPERTY(QUrl contentUrl READ url WRITE setUrl NOTIFY contentChanged FINAL)
+    Q_PROPERTY(QQmlComponent* contentComponent READ component WRITE setComponent NOTIFY contentComponentChanged FINAL)
 public:
-    explicit UCBottomEdgeRegion(QObject *parent = 0, bool isDefault = false);
-    void attachToBottomEdge(UCBottomEdge *bottomEdge);
+    explicit UCBottomEdgeRegion(QObject *parent = 0);
 
     // used internally
+    QUrl url() const;
     void setUrl(const QUrl &url);
+    QQmlComponent *component() const;
     void setComponent(QQmlComponent *component);
+    qreal from() const;
     void setFrom(qreal from);
+    qreal to() const;
     void setTo(qreal to);
+    bool enabled() const;
     void setEnabled(bool enabled);
+
+    // support API
     bool contains(qreal dragRatio);
+    virtual bool canCommit(qreal dragRatio);
     void enter();
     void exit();
     const QRectF rect(const QRectF &bottomEdgeRect);
 
     // not exposed to QML
-    bool isActive()
-    {
-        return m_active;
-    }
-    bool isDefault()
-    {
-        return m_default;
-    }
-
-    QQuickItem *regionContent();
-    inline const UbuntuToolkit::AsyncLoader *loader()
-    {
-        return const_cast<const UbuntuToolkit::AsyncLoader*>(&m_loader);
-    }
-
 Q_SIGNALS:
     void enabledChanged();
     void fromChanged();
@@ -81,29 +74,10 @@
     void dragEnded();
 
 protected:
-    enum LoadingType {
-        LoadingUrl,
-        LoadingComponent
-    };
-    UbuntuToolkit::AsyncLoader m_loader;
-    QUrl m_url;
-    QPointer<UCBottomEdge> m_bottomEdge;
-    QQmlComponent *m_component;
-    QQuickItem *m_contentItem;
-    qreal m_from;
-    qreal m_to;
-    bool m_enabled:1;
-    bool m_active:1;
-    const bool m_default:1;
-
-    friend class UCBottomEdge;
-    friend class UCBottomEdgePrivate;
-    friend class tst_BottomEdge;
-
-    void loadRegionContent();
-    void discardRegionContent();
-    void loadContent(LoadingType type);
-    Q_SLOT void onLoaderStatusChanged(UbuntuToolkit::AsyncLoader::LoadingStatus,QObject*);
+    UCBottomEdgeRegion(UCBottomEdgeRegionPrivate &dd, QObject *parent);
+private:
+    Q_DECLARE_PRIVATE(UCBottomEdgeRegion)
+    Q_PRIVATE_SLOT(d_func(), void onLoaderStatusChanged(AsyncLoader::LoadingStatus,QObject*))
 };
 
 #endif // UCBOTTOMEDGEREGION_H

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgeregion_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion_p.h	2016-04-01 13:16:40 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGEREGION_P
+#define UCBOTTOMEDGEREGION_P
+
+#include "ucbottomedgeregion.h"
+#include <AsyncLoader>
+#include <QtCore/private/qobject_p.h>
+
+using namespace UbuntuToolkit;
+
+class UCBottomEdgeRegionPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(UCBottomEdgeRegion)
+public:
+    enum LoadingType {
+        LoadingUrl,
+        LoadingComponent
+    };
+
+    UCBottomEdgeRegionPrivate();
+    void init();
+
+    static UCBottomEdgeRegionPrivate *get(UCBottomEdgeRegion *that)
+    {
+        return that->d_func();
+    }
+
+    void attachToBottomEdge(UCBottomEdge *bottomEdge);
+    virtual void loadRegionContent();
+    virtual void discardRegionContent();
+    void loadContent(LoadingType type);
+
+    void onLoaderStatusChanged(AsyncLoader::LoadingStatus,QObject*);
+
+    UbuntuToolkit::AsyncLoader loader;
+    QUrl url;
+    QPointer<UCBottomEdge> bottomEdge;
+    QQmlComponent *component;
+    QQuickItem *contentItem;
+    qreal from;
+    qreal to;
+    bool enabled:1;
+    bool active:1;
+};
+
+class DefaultRegionPrivate;
+class DefaultRegion : public UCBottomEdgeRegion
+{
+    Q_OBJECT
+public:
+    DefaultRegion(UCBottomEdge *parent);
+    bool canCommit(qreal dragRatio) Q_DECL_OVERRIDE;
+private:
+    Q_DECLARE_PRIVATE(DefaultRegion)
+};
+
+class DefaultRegionPrivate : public UCBottomEdgeRegionPrivate
+{
+    Q_DECLARE_PUBLIC(DefaultRegion)
+public:
+    DefaultRegionPrivate();
+    void loadRegionContent() Q_DECL_OVERRIDE;
+    void discardRegionContent() Q_DECL_OVERRIDE;
+};
+
+#endif // UCBOTTOMEDGEREGION_P
+

=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.h'
--- src/Ubuntu/UbuntuToolkit/asyncloader.h	2016-02-25 14:30:46 +0000
+++ src/Ubuntu/UbuntuToolkit/asyncloader.h	2016-04-01 13:16:40 +0000
@@ -52,7 +52,7 @@
     void forceCompletion();
 
 Q_SIGNALS:
-    void loadingStatus(LoadingStatus status, QObject *object);
+    void loadingStatus(AsyncLoader::LoadingStatus status, QObject *object);
 
 protected:
     Q_DECLARE_PRIVATE(AsyncLoader)

=== added file 'tests/unit_x11/tst_bottomedge/BottomEdgeWithAction.qml'
--- tests/unit_x11/tst_bottomedge/BottomEdgeWithAction.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/BottomEdgeWithAction.qml	2016-04-01 13:16:40 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        height: parent.height
+        hint.action: Action {
+            text: "Test Bottom"
+            onTriggered: bottomEdge.commit()
+        }
+
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            objectName: "default"
+            width: bottomEdge.width
+            height: bottomEdge.height
+            color: UbuntuColors.blue
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2016-03-15 12:05:29 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2016-04-01 13:16:40 +0000
@@ -18,6 +18,7 @@
 #include <QtTest/QtTest>
 #include "ucbottomedge.h"
 #include "ucbottomedgeregion.h"
+#include "ucbottomedgeregion_p.h"
 #include "ucbottomedge_p.h"
 #include "ucbottomedgehint.h"
 #include "private/ucswipearea_p.h"
@@ -143,8 +144,8 @@
         QVERIFY(test->regions("testItem"));
         QCOMPARE(test->regions("testItem")->size(), 1);
         QCOMPARE(test->regionAt("testItem", 0)->objectName(), QString("default_BottomEdgeRegion"));
-        QCOMPARE(test->regionAt("testItem", 0)->m_from, 0.33);
-        QCOMPARE(test->regionAt("testItem", 0)->m_to, 1.0);
+        QCOMPARE(UCBottomEdgeRegionPrivate::get(test->regionAt("testItem", 0))->from, 0.0);
+        QCOMPARE(UCBottomEdgeRegionPrivate::get(test->regionAt("testItem", 0))->to, 1.0);
         QVERIFY(!test->testItem()->activeRegion());
         QVERIFY(!test->testItem()->preloadContent());
     }
@@ -526,12 +527,12 @@
                 << "AddCustomRegionOwnedByOtherBottomEdge.qml"
                 << "QML BottomEdge: Cannot reuse region owned by other BottomEdge components"
                    // we should have the default region still
-                << 0.33 << 1.0 << "default_BottomEdgeRegion";
+                << 0.0 << 1.0 << "default_BottomEdgeRegion";
         QTest::newRow("clear")
                 << "ClearCustomRegions.qml"
                 << QString()
                    // we should have the default region back
-                << 0.33 << 1.0 << "default_BottomEdgeRegion";
+                << 0.0 << 1.0 << "default_BottomEdgeRegion";
     }
 
     void test_region_operations()
@@ -553,8 +554,8 @@
         QCOMPARE(privateBottomEdge->regions.size(), 1);
         UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
         QVERIFY(region);
-        QCOMPARE(region->m_from, xFrom);
-        QCOMPARE(region->m_to, xTo);
+        QCOMPARE(UCBottomEdgeRegionPrivate::get(region)->from, xFrom);
+        QCOMPARE(UCBottomEdgeRegionPrivate::get(region)->to, xTo);
         QCOMPARE(region->objectName(), xName);
     }
 
@@ -576,9 +577,9 @@
         }
         QTest::qWait(20);
         UCTestExtras::touchRelease(0, bottomEdge, movePos);
-        // we should have had 3 active region changes by now
-        // null -> region #0 -> region #1 -> null
-        QCOMPARE(spy.count(), 3);
+        // we should have had 4 active region changes by now
+        // null -> defaultRegion -> region #0 -> region #1 -> defaultRegion
+        QCOMPARE(spy.count(), 4);
     }
 
     void test_region_signals_emitted_data()
@@ -598,8 +599,8 @@
         UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
 
         // change the region so we can get the signals while dragged
-        region->m_from = 0.1;
-        region->m_to = 0.2;
+        UCBottomEdgeRegionPrivate::get(region)->from = 0.1;
+        UCBottomEdgeRegionPrivate::get(region)->to = 0.2;
 
         QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
         QPoint delta(0, -(bottomEdge->height() / 3 + UCUnits::instance()->gu(6)));
@@ -615,7 +616,8 @@
             UCTestExtras::touchDrag(0, bottomEdge, from, delta);
         }
         QTRY_COMPARE_WITH_TIMEOUT(entered.count(), 1, 500);
-        QTRY_COMPARE_WITH_TIMEOUT(exited.count(), 1, 500);
+        // exit should not be emitted as the region is not left when committed
+        QTRY_COMPARE_WITH_TIMEOUT(exited.count(), 0, 500);
     }
 
     void test_region_dragEnded_emitted_data()
@@ -677,39 +679,22 @@
         UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel;
 
         // alter default region for testing
-        region->m_from = 0.1;
-        region->m_to = 0.8;
+        UCBottomEdgeRegionPrivate::get(region)->to = 0.6;
 
         QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
-        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+        QPoint delta(0, -(bottomEdge->height() / 2));
 
         if (withMouse) {
             bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
-            from = bottomEdge->mapToScene(from).toPoint();
-            to = bottomEdge->mapToScene(to).toPoint();
-            QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
-            QPoint movePos(from);
-            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
-                QTest::mouseMove(bottomEdge->window(), movePos, 20);
-                movePos += QPoint(0, -10);
-            }
-            QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0);
         } else {
-            UCTestExtras::touchPress(0, bottomEdge, from);
-            QPoint movePos(from);
-            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
-                QTest::qWait(20);
-                UCTestExtras::touchMove(0, bottomEdge, movePos);
-                movePos += QPoint(0, -10);
-            }
-            QTest::qWait(20);
-            UCTestExtras::touchRelease(0, bottomEdge, movePos);
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta, 20);
         }
 
-        QVERIFY(bottomEdge->activeRegion());
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+        QCOMPARE(bottomEdge->activeRegion(), region);
         // the top of the committed content should not be the top of the bottom edge
         QVERIFY(style->m_panel->y() > bottomEdge->y());
-        QCOMPARE(bottomEdge->status(), UCBottomEdge::Revealed);
     }
 
     void test_drag_ends_in_uncovered_region_collapses_data()
@@ -758,7 +743,6 @@
             UCTestExtras::touchRelease(0, bottomEdge, movePos);
         }
 
-        QVERIFY(!bottomEdge->activeRegion());
         // we should be collapsing!
         QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
     }
@@ -780,8 +764,8 @@
         UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
 
         // alter region for testing
-        region->m_from = 0.1;
-        region->m_to = 0.8;
+        UCBottomEdgeRegionPrivate::get(region)->from = 0.1;
+        UCBottomEdgeRegionPrivate::get(region)->to = 0.8;
         // and connect commit to dragEnded
         connect(region, &UCBottomEdgeRegion::dragEnded, bottomEdge, &UCBottomEdge::commit);
 
@@ -794,7 +778,7 @@
             to = bottomEdge->mapToScene(to).toPoint();
             QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
             QPoint movePos(from);
-            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+            while (movePos.y() > to.y() && (bottomEdge->activeRegion() != region)) {
                 QTest::mouseMove(bottomEdge->window(), movePos, 20);
                 movePos += QPoint(0, -10);
             }
@@ -802,7 +786,7 @@
         } else {
             UCTestExtras::touchPress(0, bottomEdge, from);
             QPoint movePos(from);
-            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+            while (movePos.y() > to.y() && (bottomEdge->activeRegion() != region)) {
                 QTest::qWait(20);
                 UCTestExtras::touchMove(0, bottomEdge, movePos);
                 movePos += QPoint(0, -10);
@@ -841,8 +825,8 @@
         UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
 
         // adjust region data for the test
-        region->m_from = 0.4;
-        region->m_to = 0.2;
+        UCBottomEdgeRegionPrivate::get(region)->from = 0.4;
+        UCBottomEdgeRegionPrivate::get(region)->to = 0.2;
         QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
         QPoint delta(0, -(bottomEdge->height() / 2.0f));
         QSignalSpy activeRegion(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*)));
@@ -941,12 +925,14 @@
         }
         QTest::qWait(20);
         UCTestExtras::touchRelease(0, bottomEdge, movePos);
-        // we should have had 3 active region changes by now
-        // null -> region #0 -> region #1 -> null
-        QCOMPARE(spy.count(), 3);
-        QCOMPARE(regionObjects.size(), 5);
+        // we should have had 4 active region changes by now
+        // null -> defaultRegion -> region #0 -> region #1 -> null
+        QCOMPARE(spy.count(), 4);
+        QCOMPARE(regionObjects.size(), 6);
+        // the first two regions content is the same
         int i = 0;
         QCOMPARE(regionObjects[i++], QString("default"));
+        QCOMPARE(regionObjects[i++], QString("default"));
         QCOMPARE(regionObjects[i++], QString("region1"));
         QCOMPARE(regionObjects[i++], QString("default"));
         QCOMPARE(regionObjects[i++], QString("region2"));
@@ -960,13 +946,13 @@
 
         UCBottomEdgePrivate *d = UCBottomEdgePrivate::get(bottomEdge);
         for (int i = 0; i < d->regions.size(); i++) {
-            QVERIFY(d->regions[i]->regionContent());
+            QVERIFY(UCBottomEdgeRegionPrivate::get(d->regions[i])->contentItem);
         }
 
         // set preloadContent: false
         bottomEdge->setPreloadContent(false);
         for (int i = 0; i < d->regions.size(); i++) {
-            QVERIFY(!d->regions[i]->regionContent());
+            QVERIFY(!UCBottomEdgeRegionPrivate::get(d->regions[i])->contentItem);
         }
     }
 
@@ -978,11 +964,24 @@
         UCBottomEdgePrivate *d = UCBottomEdgePrivate::get(bottomEdge);
         // disable a region
         d->regions[0]->setEnabled(false);
-        QVERIFY(!d->regions[0]->regionContent());
+        QVERIFY(!UCBottomEdgeRegionPrivate::get(d->regions[0])->contentItem);
 
         // enable it
         d->regions[0]->setEnabled(true);
-        QTRY_VERIFY_WITH_TIMEOUT(d->regions[0]->regionContent() != nullptr, 1000);
+        QTRY_VERIFY_WITH_TIMEOUT(UCBottomEdgeRegionPrivate::get(d->regions[0])->contentItem != nullptr, 1000);
+    }
+
+    void test_action_triggered_commits()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeWithAction.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCAction *action = bottomEdge->hint()->action();
+        QVERIFY(action);
+
+        // trigger action
+        action->trigger();
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 2000);
+        QVERIFY(bottomEdge->contentItem());
     }
 };
 

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2016-02-20 15:11:02 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2016-04-01 13:16:40 +0000
@@ -23,4 +23,5 @@
     LeanActiveRegionChange.qml \
     UncoveredByRegion.qml \
     OverriddenHintTrigger.qml \
-    PreloadedContent.qml
+    PreloadedContent.qml \
+    BottomEdgeWithAction.qml