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

[Zsombor Egri]

Remove GestureDetector in favor of SwipeArea in BottomEdgeHint. Also make possible to assign Action to the component.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1718
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2493/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1223
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1220

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2493/rebuild

review: Approve (continuous-integration)

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

1719. By Zsombor Egri on 2015-11-18

staging sync

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1719
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2496/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1226
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1223

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2496/rebuild

review: Approve (continuous-integration)

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

1720. By Zsombor Egri on 2015-11-19

replace base class calls

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1720
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1238
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1235

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2508/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Like the rebase on ActionItem.
Like the QML-friendly trigger.
Like the use of the SwipeArea.
Like the comments and bug references.
No change in behavior, which is good.

review: Approve

=== modified file 'components.api'
--- components.api	2015-11-17 14:44:49 +0000
+++ components.api	2015-11-19 10:02:45 +0000
@@ -175,14 +175,12 @@
     property var icon
     property bool iconFrame
     property bool progression
-Ubuntu.Components.BottomEdgeHint 1.3: StyledItem
+Ubuntu.Components.BottomEdgeHint 1.3: ActionItem
     property int deactivateTimeout
     property Flickable flickable
-    property string iconName
-    property url iconSource
     signal clicked()
     property Status status
-    property string text
+    readonly property SwipeArea swipeArea
 Ubuntu.Components.BottomEdgeHint.Status: Enum
     Active
     Hidden
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-11-05 13:41:35 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-11-19 10:02:45 +0000
@@ -50,6 +50,7 @@
                 onTriggered: gallery.theme.name = 'Ubuntu.Components.Themes.Ambiance'
             },
             Action {
+                id: aboutAction
                 text: i18n.tr('About')
                 iconName: "info"
                 onTriggered: mainPage.pageStack.addPageToCurrentColumn(mainPage, Qt.resolvedUrl("About.qml"))
@@ -135,8 +136,6 @@
 
     BottomEdgeHint {
         flickable: widgetList
-        text: i18n.tr('About')
-        iconName: "info"
-        onClicked: mainPage.pageStack.addPageToCurrentColumn(mainPage, Qt.resolvedUrl("About.qml"))
+        action: aboutAction
     }
 }
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-11-09 16:51:41 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-11-19 10:02:45 +0000
@@ -94,7 +94,6 @@
     $$PWD/privates/threelabelsslot_p.h \
     $$PWD/ucimportversionchecker_p.h \
     $$PWD/ucbottomedgehint.h \
-    $$PWD/privates/gesturedetector.h \
     $$PWD/gestures/ucswipearea.h \
     $$PWD/gestures/ucswipearea_p.h \
     $$PWD/gestures/damper.h \
@@ -163,7 +162,6 @@
     $$PWD/privates/threelabelsslot_p.cpp \
     $$PWD/ucimportversionchecker_p.cpp \
     $$PWD/ucbottomedgehint.cpp \
-    $$PWD/privates/gesturedetector.cpp \
     $$PWD/gestures/ucswipearea.cpp \
 
 # adapters
 
=== removed file 'src/Ubuntu/Components/plugin/privates/gesturedetector.cpp'
--- src/Ubuntu/Components/plugin/privates/gesturedetector.cpp	2015-11-13 09:02:23 +0000
+++ src/Ubuntu/Components/plugin/privates/gesturedetector.cpp	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright 2015 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/>.
- *
- * Authors: Zsombor Egri <[e-mail]>
- */
-
-#include "gesturedetector.h"
-#include "ucunits.h"
-#include <QtCore/QEvent>
-#include <QtCore/QRectF>
-#include <QtGui/QTouchEvent>
-#include <QtQuick/QQuickItem>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QStyleHints>
-
-#define DETECTION_AREA_THICKNESS_GU 1.2
-
-GestureDetector::GestureDetector(QObject *parent)
-    : QObject(parent)
-    , m_owner(qobject_cast<QQuickItem*>(parent))
-    , m_status(Ready)
-    , m_bottomUpSwipeDetected(false)
-{
-    Q_ASSERT(m_owner);
-}
-GestureDetector::~GestureDetector()
-{
-    Q_FOREACH(QObject *object, m_filteredItems) {
-        object->removeEventFilter(this);
-    }
-    m_filteredItems.clear();
-}
-
-void GestureDetector::onFilteredItemDeleted(QObject *object)
-{
-    if (object) {
-        object->removeEventFilter(this);
-        m_filteredItems.removeAll(object);
-    }
-}
-
-void GestureDetector::setStatus(Status status)
-{
-    if (status == m_status) {
-        return;
-    }
-    m_status = status;
-    Q_EMIT statusChanged(m_status);
-}
-
-bool GestureDetector::isDetecting()
-{
-    return (m_status > Ready && m_status < Completed);
-}
-
-void GestureDetector::setItemFilter(QObject *item)
-{
-    m_filteredItems.append(item);
-    item->installEventFilter(this);
-    connect(item, &QObject::destroyed, this, &GestureDetector::onFilteredItemDeleted);
-}
-
-void GestureDetector::removeItemFilter(QObject *item)
-{
-    m_filteredItems.removeAll(item);
-    item->removeEventFilter(this);
-    disconnect(item, &QObject::destroyed, this, &GestureDetector::onFilteredItemDeleted);
-}
-
-bool GestureDetector::handleTouchEvent(QObject *target, QTouchEvent *event)
-{
-    switch (event->type()) {
-    case QEvent::TouchBegin: {
-        setStatus(Ready);
-        QPointF itemPoint = m_owner->mapFromScene(event->touchPoints()[0].scenePos());
-        qreal thickness = UCUnits::instance().gu(DETECTION_AREA_THICKNESS_GU);
-        QRectF detectionArea(0.0, m_owner->height() - thickness, m_owner->width(), thickness);
-        if (detectionArea.contains(itemPoint)) {
-            m_startPoint = itemPoint;
-            setStatus(Started);
-            if (target == parent()) {
-                event->accept();
-                return true;
-            }
-        }
-        return false;
-    }
-    case QEvent::TouchEnd:
-    {
-        m_startPoint = QPointF();
-        setStatus(Completed);
-        return false;
-    }
-    case QEvent::TouchCancel: {
-        m_startPoint = QPointF();
-        setStatus(Ready);
-        return false;
-    }
-    case QEvent::TouchUpdate: {
-        if (m_status == Started) {
-            QPointF itemPoint = m_owner->mapFromScene(event->touchPoints()[0].scenePos());
-            if (abs(m_startPoint.y() - itemPoint.y()) >= qApp->styleHints()->startDragDistance()) {
-                setStatus(Detected);
-                Q_EMIT bottomUpSwipeDetected();
-            }
-        }
-        return false;
-    }
-    default: return false;
-    }
-}
-
-bool GestureDetector::eventFilter(QObject *target, QEvent *event)
-{
-    if (m_filteredItems.contains(target)) {
-        QEvent::Type type = event->type();
-        if (type == QEvent::TouchBegin
-                || type == QEvent::TouchUpdate
-                || type == QEvent::TouchEnd
-                || type == QEvent::TouchCancel) {
-            QTouchEvent *touch = static_cast<QTouchEvent*>(event);
-            return handleTouchEvent(target, touch);
-        } else {
-            // pass it on
-            return false;
-        }
-    } else {
-        return QObject::eventFilter(target, event);
-    }
-}
 
=== removed file 'src/Ubuntu/Components/plugin/privates/gesturedetector.h'
--- src/Ubuntu/Components/plugin/privates/gesturedetector.h	2015-11-13 09:02:23 +0000
+++ src/Ubuntu/Components/plugin/privates/gesturedetector.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 2015 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/>.
- *
- * Authors: Zsombor Egri <[e-mail]>
- */
-
-#ifndef GESTUREDETECTOR_H
-#define GESTUREDETECTOR_H
-
-#include <QtCore/QObject>
-#include <QtCore/QPointF>
-#include <QtCore/QList>
-
-/*
- * A simple gesture detection filter class that can be used in components to detect
- * various gestures. Yet swipe from bottom up is the only gesture handled.
- * It does not grab or consume the event from the environment, acts as a filter.
- */
-class QTouchEvent;
-class QQuickItem;
-class GestureDetector : public QObject
-{
-    Q_OBJECT
-public:
-    enum Status {
-        Ready,
-        Started,
-        Detected,
-        Completed
-    };
-    explicit GestureDetector(QObject *parent = 0);
-    ~GestureDetector();
-
-    bool isDetecting();
-
-    void setItemFilter(QObject *item);
-    void removeItemFilter(QObject *item);
-
-    bool handleTouchEvent(QObject *target, QTouchEvent *event);
-
-Q_SIGNALS:
-    void statusChanged(Status status);
-
-    void bottomUpSwipeDetected();
-
-public Q_SLOTS:
-
-protected:
-    bool eventFilter(QObject *target, QEvent *event);
-
-    void setStatus(Status status);
-
-private:
-    QList<QObject*> m_filteredItems;
-    QPointF m_startPoint;
-    QQuickItem *m_owner;
-    Status m_status;
-    bool m_bottomUpSwipeDetected:1;
-
-    void onFilteredItemDeleted(QObject *object);
-};
-
-#endif // GESTUREDETECTOR_H
 
=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-05 14:28:58 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-19 10:02:45 +0000
@@ -20,14 +20,17 @@
 #include "ucstyleditembase_p.h"
 #include "quickutils.h"
 #include "ucunits.h"
+#include "gestures/ucswipearea.h"
 #include <QtQml/private/qqmlproperty_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
 
+#define SWIPE_AREA_HEIGHT_GU    3
+
 /*!
     \qmltype BottomEdgeHint
     \inqmlmodule Ubuntu.Components 1.3
     \ingroup ubuntu
-    \inherits StyledItem
+    \inherits ActionItem
     \brief The BottomEdgeHint shows the availability of extra features
     available from the bottom edge of the application.
 
@@ -50,14 +53,19 @@
     The component is styled through \b BottomEdgeHintStyle.
 */
 UCBottomEdgeHint::UCBottomEdgeHint(QQuickItem *parent)
-    : UCStyledItemBase(parent)
-    , m_gestureDetector(this)
+    : UCActionItem(parent)
+    , m_swipeArea(new UCSwipeArea)
     , m_flickable(Q_NULLPTR)
     , m_deactivateTimeout(800)
     // FIXME: we need QInputDeviceInfo to be complete with the locked!!
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     , m_status(QuickUtils::instance().mouseAttached() ? Locked : Inactive)
     , m_pressed(false)
 {
+    connect(this, &UCBottomEdgeHint::clicked, [=]() {
+        // make sure the overloaded trigger is called!
+        metaObject()->invokeMethod(this, "trigger", Q_ARG(QVariant, QVariant()));
+    });
     /*
      * we cannot use setStyleName as that will trigger style loading
      * and the qmlEngine is not known at this phase of the of the initialization
@@ -69,13 +77,8 @@
     // connect old stateChanged
     connect(this, &QQuickItem::stateChanged, this, &UCBottomEdgeHint::stateChanged);
 
-    // connect to gesture detection
-    connect(&m_gestureDetector, &GestureDetector::bottomUpSwipeDetected,
-            this, &UCBottomEdgeHint::onBottomUpSwipeDetected);
-    connect(&m_gestureDetector, &GestureDetector::statusChanged,
-            this, &UCBottomEdgeHint::onGestureStatusChanged);
-
     // FIXME: use QInputDeviceInfo once available
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     connect(&QuickUtils::instance(), &QuickUtils::mouseAttachedChanged, [this]() {
         setStatus(QuickUtils::instance().mouseAttached() ? Locked : Active);
         if (m_status == Active) {
@@ -87,9 +90,44 @@
     setAcceptedMouseButtons(Qt::LeftButton);
 }
 
+void UCBottomEdgeHint::classBegin()
+{
+    UCActionItem::classBegin();
+    init();
+}
+
+void UCBottomEdgeHint::init()
+{
+    QQml_setParent_noEvent(m_swipeArea, this);
+    m_swipeArea->setParentItem(this);
+
+    // set context
+    QQmlEngine::setContextForObject(m_swipeArea, qmlContext(this));
+
+    // initialize swipe area size
+    QQuickAnchors *anchors = QQuickItemPrivate::get(m_swipeArea)->anchors();
+    QQuickItemPrivate *thisPrivate = QQuickItemPrivate::get(this);
+    anchors->setLeft(thisPrivate->left());
+    anchors->setBottom(thisPrivate->bottom());
+    anchors->setRight(thisPrivate->right());
+    m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
+
+    // direction
+    m_swipeArea->setDirection(UCSwipeArea::Upwards);
+
+    // grid unit sync
+    connect(&UCUnits::instance(), &UCUnits::gridUnitChanged, [this] {
+        m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
+    });
+
+    // connect to gesture detection
+    connect(m_swipeArea, &UCSwipeArea::draggingChanged,
+            this, &UCBottomEdgeHint::onDraggingChanged, Qt::DirectConnection);
+}
+
 void UCBottomEdgeHint::itemChange(ItemChange change, const ItemChangeData &data)
 {
-    UCStyledItemBase::itemChange(change, data);
+    UCActionItem::itemChange(change, data);
     if (change == ItemParentHasChanged) {
         QQmlProperty bottomAnchors(this, "anchors.bottom", qmlContext(this));
         if (data.item && !QQmlPropertyPrivate::binding(bottomAnchors)) {
@@ -101,7 +139,7 @@
 
 void UCBottomEdgeHint::timerEvent(QTimerEvent *event)
 {
-    UCStyledItemBase::timerEvent(event);
+    UCActionItem::timerEvent(event);
     if (event->timerId() == m_deactivationTimer.timerId()) {
         setStatus(Inactive);
         m_deactivationTimer.stop();
@@ -111,49 +149,37 @@
 // handle clicked event when locked and enter or return is pressed
 void UCBottomEdgeHint::keyPressEvent(QKeyEvent *event)
 {
-    UCStyledItemBase::keyPressEvent(event);
+    UCActionItem::keyPressEvent(event);
     if ((status() >= Active) && (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)) {
         Q_EMIT clicked();
     }
 }
 
-// handle gesture detection
-void UCBottomEdgeHint::touchEvent(QTouchEvent *event)
-{
-    UCStyledItemBase::touchEvent(event);
-    m_gestureDetector.handleTouchEvent(this, event);
-}
-
 // handle click event
 void UCBottomEdgeHint::mousePressEvent(QMouseEvent *event)
 {
     if (contains(event->localPos()) && (m_status >= Active)) {
         m_pressed = true;
     } else {
-        UCStyledItemBase::mousePressEvent(event);
+        UCActionItem::mousePressEvent(event);
     }
 }
 void UCBottomEdgeHint::mouseReleaseEvent(QMouseEvent *event)
 {
-    UCStyledItemBase::mouseReleaseEvent(event);
+    UCActionItem::mouseReleaseEvent(event);
     if (m_pressed && (m_status >= Active)) {
         Q_EMIT clicked();
     }
 }
 
 // watch gesture detection status changes
-void UCBottomEdgeHint::onBottomUpSwipeDetected()
-{
-    m_deactivationTimer.stop();
-    setStatus(Active);
-}
-
-void UCBottomEdgeHint::onGestureStatusChanged(GestureDetector::Status status)
-{
-    if (status == GestureDetector::Completed) {
-        if (m_status == Active) {
-            m_deactivationTimer.start(m_deactivateTimeout, this);
-        }
+void UCBottomEdgeHint::onDraggingChanged(bool dragging)
+{
+    if (dragging) {
+        m_deactivationTimer.stop();
+        setStatus(Active);
+    } else if (m_status == Active) {
+        m_deactivationTimer.start(m_deactivateTimeout, this);
     }
 }
 
@@ -200,7 +226,6 @@
                    this, &UCBottomEdgeHint::handleFlickableActivation);
         disconnect(m_flickable, &QQuickFlickable::movingChanged,
                    this, &UCBottomEdgeHint::handleFlickableActivation);
-        m_gestureDetector.removeItemFilter(m_flickable);
     }
     m_flickable = flickable;
     if (m_flickable) {
@@ -208,7 +233,6 @@
                 this, &UCBottomEdgeHint::handleFlickableActivation, Qt::DirectConnection);
         connect(m_flickable, &QQuickFlickable::movingChanged,
                 this, &UCBottomEdgeHint::handleFlickableActivation, Qt::DirectConnection);
-        m_gestureDetector.setItemFilter(m_flickable);
     }
     Q_EMIT flickableChanged();
 }
@@ -216,7 +240,7 @@
 // flickable moves hide the hint only if the current status is not Locked
 void UCBottomEdgeHint::handleFlickableActivation()
 {
-    if (m_status < Locked && !m_gestureDetector.isDetecting() && !m_deactivationTimer.isActive()) {
+    if (m_status < Locked && !m_swipeArea->dragging() && !m_deactivationTimer.isActive()) {
         bool moving = m_flickable->isFlicking() || m_flickable->isMoving();
         if (moving) {
             setStatus(Hidden);
@@ -304,6 +328,7 @@
 UCBottomEdgeHint::Status UCBottomEdgeHint::status()
 {
     // FIXME: we won't need this once we get the QInputDeviceInfo reporting mouse attach/detach
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     if (QuickUtils::instance().mouseAttached()) {
         m_status = Locked;
     }
@@ -313,15 +338,19 @@
 void UCBottomEdgeHint::setStatus(Status status)
 {
     // FIXME: we need QInputDeviceInfo to complete this!
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     // cannot unlock if mouse is attached or we don't have touch screen available
     if (status == m_status || (status != Locked && QuickUtils::instance().mouseAttached())) {
         return;
     }
+    // if the previous state was Locked and the new one is Active, start deactivation timer
+    if (m_status == Locked && status == Active && !m_deactivationTimer.isActive()) {
+        m_deactivationTimer.start(m_deactivateTimeout, this);
+    } else if (status != Active && m_deactivationTimer.isActive()) {
+        // make sure we stop the deactivation timer if Inactive or Locked
+        m_deactivationTimer.stop();
+    }
     m_status = status;
-    // make sure we stop the deactivation timer if Inactive or Locked
-    if (status != Active && m_deactivationTimer.isActive()) {
-        m_deactivationTimer.stop();
-    }
     Q_EMIT statusChanged();
 }
 
@@ -345,3 +374,10 @@
     }
     Q_EMIT deactivateTimeoutChanged();
 }
+
+/*!
+ * \qmlproperty SwipeArea BottomEdgeHint::swipeArea
+ * \readonly
+ * The property specifies the SwipeArea attached to the component driving its
+ * behavior.
+ */
 
=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-11-05 14:06:36 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-11-19 10:02:45 +0000
@@ -19,20 +19,18 @@
 #ifndef UCBOTTOMEDGEHINT_H
 #define UCBOTTOMEDGEHINT_H
 
-#include "ucstyleditembase.h"
-#include "privates/gesturedetector.h"
+#include "ucactionitem.h"
 
 class QQuickFlickable;
-class UCBottomEdgeHint : public UCStyledItemBase
+class UCSwipeArea;
+class UCBottomEdgeHint : public UCActionItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
-    Q_PROPERTY(QString text MEMBER m_text NOTIFY textChanged FINAL)
-    Q_PROPERTY(QUrl iconSource MEMBER m_iconSource NOTIFY iconSourceChanged FINAL)
-    Q_PROPERTY(QString iconName MEMBER m_iconName NOTIFY iconNameChanged FINAL)
     Q_PROPERTY(QQuickFlickable *flickable MEMBER m_flickable WRITE setFlickable NOTIFY flickableChanged FINAL)
     Q_PROPERTY(Status status MEMBER m_status WRITE setStatus NOTIFY statusChanged FINAL)
     Q_PROPERTY(int deactivateTimeout MEMBER m_deactivateTimeout WRITE setDeactivateTimeout NOTIFY deactivateTimeoutChanged FINAL)
+    Q_PROPERTY(UCSwipeArea* swipeArea READ swipeArea CONSTANT FINAL)
     // deprecated
     Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
 public:
@@ -47,11 +45,15 @@
     void setFlickable(QQuickFlickable *flickable);
     Status status();
     void setStatus(Status status);
+    void setDeactivateTimeout(int timeout);
+    UCSwipeArea *swipeArea() const
+    {
+        return m_swipeArea;
+    }
 
     // deprecated
     QString state() const;
     void setState(const QString &state);
-    void setDeactivateTimeout(int timeout);
 
 Q_SIGNALS:
     void textChanged();
@@ -66,23 +68,21 @@
     // deprecated
     void stateChanged();
 protected:
+    void classBegin();
     void itemChange(ItemChange change, const ItemChangeData &data);
     void timerEvent(QTimerEvent *event);
     void keyPressEvent(QKeyEvent *event);
-    void touchEvent(QTouchEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
 
     void handleFlickableActivation();
-    void onBottomUpSwipeDetected();
-    void onGestureStatusChanged(GestureDetector::Status status);
+    void onDraggingChanged(bool dragging);
+
+    void init();
 
 private:
-    GestureDetector m_gestureDetector;
     QBasicTimer m_deactivationTimer;
-    QString m_text;
-    QUrl m_iconSource;
-    QString m_iconName;
+    UCSwipeArea *m_swipeArea;
     QQuickFlickable *m_flickable;
     int m_deactivateTimeout;
     Status m_status;
 
=== modified file 'tests/unit_x11/tst_components/tst_bottomedgehint.qml'
--- tests/unit_x11/tst_components/tst_bottomedgehint.qml	2015-11-05 14:28:58 +0000
+++ tests/unit_x11/tst_components/tst_bottomedgehint.qml	2015-11-19 10:02:45 +0000
@@ -36,6 +36,11 @@
 
     BottomEdgeHint {
         id: bottomEdgeHint
+        property int triggerCount: 0
+        function trigger(v)
+        {
+            triggerCount++;
+        }
     }
     BottomEdgeHint {
         id: floatingHint
@@ -199,7 +204,7 @@
 
         // FIXME: must be executed before the test_hiding as flick with mouse affects
         // the touch drag on ListView for some unknown reason
-        function test_touch_gesture() {
+        function test_0_touch_gesture() {
             if (hasMouseAttached) {
                 skip("", "The test requires touch environment");
             }
@@ -210,5 +215,13 @@
             // then wait till we get back to Idle
             tryCompare(bottomEdgeHint, "status", BottomEdgeHint.Inactive, 1000);
         }
+
+        function test_custom_trigger_on_clicked() {
+            bottomEdgeHint.status = BottomEdgeHint.Locked;
+            var prevCount = bottomEdgeHint.triggerCount;
+            mouseClick(bottomEdgeHint, centerOf(bottomEdgeHint).x, centerOf(bottomEdgeHint).y);
+            clickSpy.wait(500);
+            compare(bottomEdgeHint.triggerCount, prevCount + 1, "Overloaded trigger not called");
+        }
     }
 }