1
=== modified file 'components.api'
2
--- components.api	2016-02-17 12:57:49 +0000
3
+++ components.api	2016-02-24 06:31:56 +0000
4
@@ -8,6 +8,7 @@
5
8
    signal clicked()
8
    signal clicked()
6
9
    signal pressAndHold()
9
    signal pressAndHold()
7
10
    readonly property bool pressed
10
    readonly property bool pressed
8
11
    readonly property UCMargins sensingMargins
9
11
Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
12
Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
10
12
    property string description
13
    property string description
11
13
    property bool enabled
14
    property bool enabled
12
@@ -1557,6 +1558,12 @@
13
1557
UCListItemExpansion: QtObject
1558
UCListItemExpansion: QtObject
14
1558
    property bool expanded
1559
    property bool expanded
15
1559
    property double height
1560
    property double height
16
1561
UCMargins: QtObject
17
1562
    property double all
18
1563
    property double bottom
19
1564
    property double left
20
1565
    property double right
21
1566
    property double top
22
1560
UCStateSaverAttached: QtObject
1567
UCStateSaverAttached: QtObject
23
1561
    property bool enabled
1568
    property bool enabled
24
1562
    property string properties
1569
    property string properties
25
1563
1570
26
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
27
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-02-12 13:46:51 +0000
28
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-02-24 06:31:56 +0000
29
@@ -222,6 +222,7 @@
30
222
    qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
222
    qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
31
223
    qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
223
    qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
32
224
    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
224
    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
33
225
    qmlRegisterType<UCMargins>();
34
225
    qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", "Not instantiable");
226
    qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", "Not instantiable");
35
226
    qmlRegisterUncreatableType<UCSlotsLayoutPadding>(uri, 1, 3, "SlotsLayoutPadding", "Not instantiable");
227
    qmlRegisterUncreatableType<UCSlotsLayoutPadding>(uri, 1, 3, "SlotsLayoutPadding", "Not instantiable");
36
227
    qmlRegisterType<UCListItemLayout>(uri, 1, 3, "ListItemLayout");
228
    qmlRegisterType<UCListItemLayout>(uri, 1, 3, "ListItemLayout");
37
228
229
38
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
39
--- src/Ubuntu/Components/plugin/plugin.pri	2016-02-08 12:47:32 +0000
40
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-02-24 06:31:56 +0000
41
@@ -90,6 +90,7 @@
42
90
    $$PWD/uchaptics.h \
90
    $$PWD/uchaptics.h \
43
91
    $$PWD/ucabstractbutton.h \
91
    $$PWD/ucabstractbutton.h \
44
92
    $$PWD/ucabstractbutton_p.h \
92
    $$PWD/ucabstractbutton_p.h \
45
93
    $$PWD/ucmargins.h \
46
93
    $$PWD/ucthemingextension.h \
94
    $$PWD/ucthemingextension.h \
47
94
    $$PWD/ucheader.h \
95
    $$PWD/ucheader.h \
48
95
    $$PWD/uclabel.h \
96
    $$PWD/uclabel.h \
49
96
97
50
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
51
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-02-11 08:54:26 +0000
52
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-02-24 06:31:56 +0000
53
@@ -17,11 +17,15 @@
54
17
#include "ucabstractbutton.h"
17
#include "ucabstractbutton.h"
55
18
#include "ucabstractbutton_p.h"
18
#include "ucabstractbutton_p.h"
56
19
#include "uchaptics.h"
19
#include "uchaptics.h"
57
20
#include "ucunits.h"
58
20
#include "ucaction.h"
21
#include "ucaction.h"
59
21
#include <QtQuick/private/qquickitem_p.h>
22
#include <QtQuick/private/qquickitem_p.h>
60
22
#include <QtQuick/private/qquickmousearea_p.h>
23
#include <QtQuick/private/qquickmousearea_p.h>
61
23
#include <QtQml/private/qqmlglobal_p.h>
24
#include <QtQml/private/qqmlglobal_p.h>
62
24
25
63
26
#define MIN_SENSING_WIDTH_GU    4
64
27
#define MIN_SENSING_HEIGHT_GU   4
65
28
66
25
UCAbstractButtonPrivate::UCAbstractButtonPrivate()
29
UCAbstractButtonPrivate::UCAbstractButtonPrivate()
67
26
    : UCActionItemPrivate()
30
    : UCActionItemPrivate()
68
27
    , mouseArea(new QQuickMouseArea)
31
    , mouseArea(new QQuickMouseArea)
69
@@ -39,6 +43,7 @@
70
39
/*!
43
/*!
71
40
    \qmltype AbstractButton
44
    \qmltype AbstractButton
72
41
    \instantiates UCAbstractButton
45
    \instantiates UCAbstractButton
73
46
    \inherits ActionItem
74
42
    \inqmlmodule Ubuntu.Components 1.1
47
    \inqmlmodule Ubuntu.Components 1.1
75
43
    \ingroup ubuntu
48
    \ingroup ubuntu
76
44
    \brief The AbstractButton class defines the behavior of the button.
49
    \brief The AbstractButton class defines the behavior of the button.
77
@@ -49,6 +54,34 @@
78
49
    If an action is specified, the button's clicked signal will trigger the action.
54
    If an action is specified, the button's clicked signal will trigger the action.
79
50
    Subclasses of AbstractButton can use other properties of action (for example
55
    Subclasses of AbstractButton can use other properties of action (for example
80
51
    the text and iconName).
56
    the text and iconName).
81
57
82
58
    \section2 Sensing area
83
59
    It has been proven that, on touch devices in order to properly aim an active
84
60
    component a minimum of 8x8 millimeters (i.e. 4x4 grid units) area has to be
85
61
    provided. However not all the visuals are of that size, as Icons for example
86
62
    are defaulted to be 2x2 grid units, but a component containing a single Icon
87
63
    still has to be able to capture the press events. Therefore AbstractButton
88
64
    makes sure this rule of 4x4 grid units for the sensing area is provided. In
89
65
    addition it exposes the \l sensingMargins property which extends the component's
90
66
    sensing area in all the directions, so other use cases when the sensing area
91
67
    needs to be extended outside of the component's area, or restricted on a
92
68
    given area of the component can be implemented. The following example extends
93
69
    the sensing area on the left, top and bottom with 1 grid units, and on the
94
70
    right with 10 grid units.
95
71
    \qml
96
72
    AbstractButton {
97
73
        width: units.gu(2)
98
74
        height: units.gu(2)
99
75
        sensingMargins {
100
76
            left: units.gu(1)
101
77
            top: units.gu(1)
102
78
            bottom: units.gu(1)
103
79
            right: units.gu(10)
104
80
        }
105
81
    }
106
82
    \endqml
107
83
    \note Do not set clipping for the component as that will restrict the sensing
108
84
    area to be available on the visual area only.
109
52
*/
85
*/
110
53
86
111
54
/*!
87
/*!
112
@@ -111,6 +144,9 @@
113
111
    UCActionItemPrivate::completeComponentInitialization();
144
    UCActionItemPrivate::completeComponentInitialization();
114
112
    Q_Q(UCAbstractButton);
145
    Q_Q(UCAbstractButton);
115
113
146
116
147
    // adjust sensing area
117
148
    _q_adjustSensingArea();
118
149
119
114
    // bind mouse area
150
    // bind mouse area
120
115
    QObject::connect(mouseArea, &QQuickMouseArea::pressedChanged, q, &UCAbstractButton::pressedChanged);
151
    QObject::connect(mouseArea, &QQuickMouseArea::pressedChanged, q, &UCAbstractButton::pressedChanged);
121
116
    QObject::connect(mouseArea, &QQuickMouseArea::hoveredChanged, q, &UCAbstractButton::hoveredChanged);
152
    QObject::connect(mouseArea, &QQuickMouseArea::hoveredChanged, q, &UCAbstractButton::hoveredChanged);
122
@@ -122,6 +158,9 @@
123
122
// may not be available on compoennt completion
158
// may not be available on compoennt completion
124
123
void UCAbstractButtonPrivate::_q_mouseAreaPressed()
159
void UCAbstractButtonPrivate::_q_mouseAreaPressed()
125
124
{
160
{
126
161
    if (!mouseArea->pressed()) {
127
162
        return;
128
163
    }
129
125
    bool longPressConnected = isPressAndHoldConnected();
164
    bool longPressConnected = isPressAndHoldConnected();
130
126
    Q_Q(UCAbstractButton);
165
    Q_Q(UCAbstractButton);
131
127
    if (longPressConnected && !pressAndHoldConnected) {
166
    if (longPressConnected && !pressAndHoldConnected) {
132
@@ -175,6 +214,48 @@
133
175
    }
214
    }
134
176
}
215
}
135
177
216
136
217
void UCAbstractButtonPrivate::_q_adjustSensingArea()
137
218
{
138
219
    Q_Q(UCAbstractButton);
139
220
    if (!componentComplete) {
140
221
        // we do not hammer the component until completion
141
222
        return;
142
223
    }
143
224
    // use the sensingMargins in the minimum calculation
144
225
    qreal minimumWidth = UCUnits::instance()->gu(MIN_SENSING_WIDTH_GU);
145
226
    qreal minimumHeight = UCUnits::instance()->gu(MIN_SENSING_HEIGHT_GU);
146
227
    qreal hDelta = minimumWidth
147
228
            - (q->width() + (sensingMargins ? (sensingMargins->left() + sensingMargins->right()) : 0.0));
148
229
    qreal vDelta = minimumHeight
149
230
            - (q->height() + (sensingMargins ? (sensingMargins->top() + sensingMargins->bottom()) : 0.0));
150
231
    // adjust the sensing area
151
232
    QQuickAnchors *mouseAreaAnchors = QQuickItemPrivate::get(mouseArea)->anchors();
152
233
    if (hDelta >= 0) {
153
234
        // the horizontal size is still smaller than the minimum
154
235
        mouseAreaAnchors->setLeftMargin(-(hDelta / 2 + (sensingMargins ? sensingMargins->left() : 0.0)));
155
236
        mouseAreaAnchors->setRightMargin(-(hDelta / 2 + (sensingMargins ? sensingMargins->right() : 0.0)));
156
237
    } else if (sensingMargins) {
157
238
        mouseAreaAnchors->setLeftMargin(-sensingMargins->left());
158
239
        mouseAreaAnchors->setRightMargin(-sensingMargins->right());
159
240
    }
160
241
    if (vDelta >= 0) {
161
242
        // the vertical size is still smaller than the minimum
162
243
        mouseAreaAnchors->setTopMargin(-(vDelta / 2 + (sensingMargins ? sensingMargins->top() : 0.0)));
163
244
        mouseAreaAnchors->setBottomMargin(-(vDelta / 2 + (sensingMargins ? sensingMargins->bottom() : 0.0)));
164
245
    } else if (sensingMargins) {
165
246
        mouseAreaAnchors->setTopMargin(-sensingMargins->top());
166
247
        mouseAreaAnchors->setBottomMargin(-sensingMargins->bottom());
167
248
    }
168
249
}
169
250
170
251
void UCAbstractButton::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
171
252
{
172
253
    UCActionItem::geometryChanged(newGeometry, oldGeometry);
173
254
174
255
    // adjust internal mouse area's size
175
256
    d_func()->_q_adjustSensingArea();
176
257
}
177
258
178
178
/*!
259
/*!
179
179
 * \qmlproperty bool AbstractButton::pressed
260
 * \qmlproperty bool AbstractButton::pressed
180
180
 * True if the user presses a mouse button in the button's mouse area.
261
 * True if the user presses a mouse button in the button's mouse area.
181
@@ -212,4 +293,58 @@
182
212
    return d->mouseArea;
293
    return d->mouseArea;
183
213
}
294
}
184
214
295
185
296
/*!
186
297
 * \qmlpropertygroup ::AbstractButton::sensingMargins
187
298
 * \qmlproperty real AbstractButton::sensingMargins.left
188
299
 * \qmlproperty real AbstractButton::sensingMargins.right
189
300
 * \qmlproperty real AbstractButton::sensingMargins.top
190
301
 * \qmlproperty real AbstractButton::sensingMargins.bottom
191
302
 * \qmlproperty real AbstractButton::sensingMargins.all
192
303
 * The property group specifies the margins extending the visual area where the
193
304
 * touch and mouse events are sensed. Positive values mean the area will be extended
194
305
 * on the specified direction outside of the visual area, negative values mean
195
306
 * the sensing will fall under the component's visual border.
196
307
 * All values default to 0.
197
308
 *
198
309
 * \note If the visual area and the sensing margins are not reaching the 4x4 grid
199
310
 * units limit, the component will fall back to these minimum limits.
200
311
 * For example, extending a 2x2 grid unit visual component into 5x4 grid units
201
312
 * sensing area would look as follows:
202
313
 * \qml
203
314
 * AbstractButton {
204
315
 *     width: units.gu(2)
205
316
 *     height: units.gu(2)
206
317
 *     Icon {
207
318
 *         name: "settings"
208
319
 *     }
209
320
 *     sensingArea {
210
321
 *         // no need to set the vertical direction as the minimum of
211
322
 *         // 4 grid units will be taken automatically
212
323
 *         leftMargin: units.gu(1)
213
324
 *         // we only have to add 2 grid units as the width + left margin
214
325
 *         // already gives us 3 grid units out of 5
215
326
 *         rightMargin: units.gu(2)
216
327
 *     }
217
328
 * }
218
329
 * \endqml
219
330
 */
220
331
UCMargins *UCAbstractButton::sensingMargins()
221
332
{
222
333
    Q_D(UCAbstractButton);
223
334
    if (!d->sensingMargins) {
224
335
        d->sensingMargins = new UCMargins(this);
225
336
226
337
        // as this is the first time we create the sensing margins we only
227
338
        // connect now to grid unit changes to keep sensing area size in sync
228
339
        connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), this, SLOT(_q_adjustSensingArea()));
229
340
        // also connect to the margin changes
230
341
        connect(d->sensingMargins, SIGNAL(leftChanged()), this, SLOT(_q_adjustSensingArea()));
231
342
        connect(d->sensingMargins, SIGNAL(rightChanged()), this, SLOT(_q_adjustSensingArea()));
232
343
        connect(d->sensingMargins, SIGNAL(topChanged()), this, SLOT(_q_adjustSensingArea()));
233
344
        connect(d->sensingMargins, SIGNAL(bottomChanged()), this, SLOT(_q_adjustSensingArea()));
234
345
        connect(d->sensingMargins, SIGNAL(allChanged()), this, SLOT(_q_adjustSensingArea()));
235
346
    }
236
347
    return d->sensingMargins;
237
348
}
238
349
239
215
#include "moc_ucabstractbutton.cpp"
350
#include "moc_ucabstractbutton.cpp"
240
216
351
241
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
242
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-12-17 13:00:10 +0000
243
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-02-24 06:31:56 +0000
244
@@ -18,6 +18,8 @@
245
18
#define UCABSTRACTBUTTON_H
18
#define UCABSTRACTBUTTON_H
246
19
19
247
20
#include "ucactionitem.h"
20
#include "ucactionitem.h"
248
21
#include "ucmargins.h"
249
22
#include <QtQuick/private/qquickevents_p_p.h>
250
21
23
251
22
class QQuickMouseArea;
24
class QQuickMouseArea;
252
23
class QQuickMouseEvent;
25
class QQuickMouseEvent;
253
@@ -27,6 +29,7 @@
254
27
    Q_OBJECT
29
    Q_OBJECT
255
28
    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
30
    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
256
29
    Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
31
    Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
257
32
    Q_PROPERTY(UCMargins *sensingMargins READ sensingMargins CONSTANT FINAL)
258
30
33
259
31
    // internal, declared to support the deprecated ListItem module
34
    // internal, declared to support the deprecated ListItem module
260
32
    Q_PROPERTY(bool __acceptEvents READ acceptEvents WRITE setAcceptEvents)
35
    Q_PROPERTY(bool __acceptEvents READ acceptEvents WRITE setAcceptEvents)
261
@@ -36,6 +39,7 @@
262
36
39
263
37
    bool pressed() const;
40
    bool pressed() const;
264
38
    bool hovered() const;
41
    bool hovered() const;
265
42
    UCMargins *sensingMargins();
266
39
43
267
40
    bool privateAcceptEvents() const;
44
    bool privateAcceptEvents() const;
268
41
    void setPrivateAcceptEvents(bool accept);
45
    void setPrivateAcceptEvents(bool accept);
269
@@ -45,6 +49,8 @@
270
45
49
271
46
protected:
50
protected:
272
47
    void classBegin();
51
    void classBegin();
273
52
    virtual void geometryChanged(const QRectF &newGeometry,
274
53
                                 const QRectF &oldGeometry);
275
48
    void keyReleaseEvent(QKeyEvent *key);
54
    void keyReleaseEvent(QKeyEvent *key);
276
49
55
277
50
Q_SIGNALS:
56
Q_SIGNALS:
278
@@ -60,6 +66,9 @@
279
60
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())
66
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())
280
61
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaClicked())
67
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaClicked())
281
62
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressAndHold())
68
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressAndHold())
282
69
    Q_PRIVATE_SLOT(d_func(), void _q_adjustSensingArea())
283
63
};
70
};
284
64
71
285
72
QML_DECLARE_TYPE(UCMargins)
286
73
287
65
#endif // UCABSTRACTBUTTON_H
74
#endif // UCABSTRACTBUTTON_H
288
66
75
289
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton_p.h'
290
--- src/Ubuntu/Components/plugin/ucabstractbutton_p.h	2015-12-17 13:00:10 +0000
291
+++ src/Ubuntu/Components/plugin/ucabstractbutton_p.h	2016-02-24 06:31:56 +0000
292
@@ -41,8 +41,10 @@
293
41
    void _q_mouseAreaPressed();
41
    void _q_mouseAreaPressed();
294
42
    void _q_mouseAreaClicked();
42
    void _q_mouseAreaClicked();
295
43
    void _q_mouseAreaPressAndHold();
43
    void _q_mouseAreaPressAndHold();
296
44
    void _q_adjustSensingArea();
297
44
45
298
45
    QQuickMouseArea *mouseArea;
46
    QQuickMouseArea *mouseArea;
299
47
    UCMargins *sensingMargins = nullptr;
300
46
    bool acceptEvents:1;
48
    bool acceptEvents:1;
301
47
    bool pressAndHoldConnected:1;
49
    bool pressAndHoldConnected:1;
302
48
};
50
};
303
49
51
304
=== added file 'src/Ubuntu/Components/plugin/ucmargins.h'
305
--- src/Ubuntu/Components/plugin/ucmargins.h	1970-01-01 00:00:00 +0000
306
+++ src/Ubuntu/Components/plugin/ucmargins.h	2016-02-24 06:31:56 +0000
307
@@ -0,0 +1,76 @@
308
1
/*
309
2
 * Copyright 2015 Canonical Ltd.
310
3
 *
311
4
 * This program is free software; you can redistribute it and/or modify
312
5
 * it under the terms of the GNU Lesser General Public License as published by
313
6
 * the Free Software Foundation; version 3.
314
7
 *
315
8
 * This program is distributed in the hope that it will be useful,
316
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
317
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
318
11
 * GNU Lesser General Public License for more details.
319
12
 *
320
13
 * You should have received a copy of the GNU Lesser General Public License
321
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
322
15
 */
323
16
324
17
#ifndef UCMARGINS_H
325
18
#define UCMARGINS_H
326
19
327
20
#include <QtCore/QObject>
328
21
#include <QtQuick/QQuickItem>
329
22
330
23
class UCMargins : public QObject
331
24
{
332
25
    Q_OBJECT
333
26
    Q_PROPERTY(qreal left MEMBER m_left NOTIFY leftChanged FINAL)
334
27
    Q_PROPERTY(qreal top MEMBER m_top NOTIFY topChanged FINAL)
335
28
    Q_PROPERTY(qreal right MEMBER m_right NOTIFY rightChanged FINAL)
336
29
    Q_PROPERTY(qreal bottom MEMBER m_bottom NOTIFY bottomChanged FINAL)
337
30
    Q_PROPERTY(qreal all MEMBER m_all NOTIFY allChanged FINAL)
338
31
public:
339
32
    UCMargins(QObject *parent = 0);
340
33
341
34
    qreal left() const;
342
35
    qreal top() const;
343
36
    qreal right() const;
344
37
    qreal bottom() const;
345
38
346
39
Q_SIGNALS:
347
40
    void leftChanged();
348
41
    void topChanged();
349
42
    void rightChanged();
350
43
    void bottomChanged();
351
44
    void allChanged();
352
45
353
46
private:
354
47
    qreal m_left = 0.0;
355
48
    qreal m_top = 0.0;
356
49
    qreal m_right = 0.0;
357
50
    qreal m_bottom = 0.0;
358
51
    qreal m_all = 0.0;
359
52
};
360
53
361
54
inline UCMargins::UCMargins(QObject *parent) : QObject(parent) {}
362
55
363
56
inline qreal UCMargins::left() const
364
57
{
365
58
    return qFuzzyIsNull(m_left) ? m_all : m_left;
366
59
}
367
60
368
61
inline qreal UCMargins::top() const
369
62
{
370
63
    return qFuzzyIsNull(m_top) ? m_all : m_top;
371
64
}
372
65
373
66
inline qreal UCMargins::right() const
374
67
{
375
68
    return qFuzzyIsNull(m_right) ? m_all : m_right;
376
69
}
377
70
378
71
inline qreal UCMargins::bottom() const
379
72
{
380
73
    return qFuzzyIsNull(m_bottom) ? m_all : m_bottom;
381
74
}
382
75
383
76
#endif // UCMARGINS_H
384
0
77
385
=== modified file 'tests/unit_x11/tst_components/tst_abstractbutton13.qml'
386
--- tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-12-12 07:22:08 +0000
387
+++ tests/unit_x11/tst_components/tst_abstractbutton13.qml	2016-02-24 06:31:56 +0000
388
@@ -41,6 +41,41 @@
389
41
            height: width
41
            height: width
390
42
            function trigger() {}
42
            function trigger() {}
391
43
        }
43
        }
392
44
        Item {
393
45
            // have enough space for the test subject
394
46
            width: units.gu(10)
395
47
            height: units.gu(10)
396
48
            AbstractButton {
397
49
                id: buttonWithSensing
398
50
                anchors.centerIn: parent
399
51
            }
400
52
        }
401
53
        Rectangle {
402
54
            color: "red"
403
55
            width: units.gu(10)
404
56
            height: units.gu(10)
405
57
            AbstractButton {
406
58
                id: increasedSensing
407
59
                anchors.centerIn: parent
408
60
                width: units.gu(4)
409
61
                height: units.gu(4)
410
62
                sensingMargins {
411
63
                    left: units.gu(2)
412
64
                    right: units.gu(2)
413
65
                    top: units.gu(2)
414
66
                    bottom: units.gu(2)
415
67
                }
416
68
                style: Item {
417
69
                    anchors.fill: parent
418
70
                    Rectangle {
419
71
                        color: "blue"
420
72
                        parent: styledItem.__mouseArea
421
73
                        anchors.fill: parent
422
74
                    }
423
75
                }
424
76
            }
425
77
        }
426
78
427
44
        AbstractButton {
79
        AbstractButton {
428
45
            id: suppressTrigger2
80
            id: suppressTrigger2
429
46
            width: units.gu(10)
81
            width: units.gu(10)
430
@@ -53,6 +88,7 @@
431
53
            height: width
88
            height: width
432
54
            function trigger(v) { triggered(v) }
89
            function trigger(v) { triggered(v) }
433
55
        }
90
        }
434
91
435
56
        Loader {
92
        Loader {
436
57
            id: loader
93
            id: loader
437
58
            width: units.gu(10)
94
            width: units.gu(10)
438
@@ -103,6 +139,14 @@
439
103
        when: windowShown
139
        when: windowShown
440
104
140
441
105
        function cleanup() {
141
        function cleanup() {
442
142
            buttonWithSensing.sensingMargins.left = 0;
443
143
            buttonWithSensing.sensingMargins.top = 0;
444
144
            buttonWithSensing.sensingMargins.right = 0;
445
145
            buttonWithSensing.sensingMargins.bottom = 0;
446
146
            buttonWithSensing.sensingMargins.all = 0;
447
147
            buttonWithSensing.width = 0;
448
148
            buttonWithSensing.height = 0;
449
149
            signalSpy.target = absButton;
450
106
            signalSpy.clear();
150
            signalSpy.clear();
451
107
            signalSpy.target = absButton;
151
            signalSpy.target = absButton;
452
108
            triggeredSpy.clear();
152
            triggeredSpy.clear();
453
@@ -110,6 +154,14 @@
454
110
            loader.longPress = false;
154
            loader.longPress = false;
455
111
        }
155
        }
456
112
156
457
157
        function initTestCase() {
458
158
            compare(buttonWithSensing.sensingMargins.left, 0);
459
159
            compare(buttonWithSensing.sensingMargins.right, 0);
460
160
            compare(buttonWithSensing.sensingMargins.top, 0);
461
161
            compare(buttonWithSensing.sensingMargins.bottom, 0);
462
162
            compare(buttonWithSensing.sensingMargins.all, 0);
463
163
        }
464
164
465
113
        function test_action() {
165
        function test_action() {
466
114
            compare(absButton.action, null,"Action is null by default")
166
            compare(absButton.action, null,"Action is null by default")
467
115
            absButton.action = action1
167
            absButton.action = action1
468
@@ -184,5 +236,97 @@
469
184
            mouseClick(loader.item, centerOf(loader.item).x, centerOf(loader.item).y);
236
            mouseClick(loader.item, centerOf(loader.item).x, centerOf(loader.item).y);
470
185
            compare(loader.click, true, "clicked not captured by Connection");
237
            compare(loader.click, true, "clicked not captured by Connection");
471
186
        }
238
        }
472
239
473
240
        function test_sensing_area_data() {
474
241
            return [
475
242
                // margins is [left, top, right, bottom]
476
243
                {tag: "zero size, no margins, click in visual", sizeGU: [0, 0], clickGU: [0, 0], sensingGU: [4, 4]},
477
244
                {tag: "zero size, no margins, click in sensing", sizeGU: [0, 0], clickGU: [4, 4], sensingGU: [4, 4]},
478
245
                {tag: "zero size, 1GU margins, click in visual", sizeGU: [0, 0], marginsGU: [1, 1, 1, 1], clickGU: [0, 0], sensingGU: [4, 4]},
479
246
                {tag: "zero size, 1GU margins, click in sensing", sizeGU: [0, 0], marginsGU: [1, 1, 1, 1], clickGU: [4, 4], sensingGU: [4, 4]},
480
247
                {tag: "zero size, 3GU margins horizontal, click in sensing", sizeGU: [0, 0], marginsGU: [3, 0, 3, 0], clickGU: [4, 4], sensingGU: [6, 4]},
481
248
                {tag: "zero size, 3GU margins vertical, click in sensing", sizeGU: [0, 0], marginsGU: [0, 3, 0, 3], clickGU: [4, 4], sensingGU: [4, 6]},
482
249
                {tag: "zero size, 3GU margins around, click in sensing", sizeGU: [0, 0], marginsGU: [3, 3, 3, 3], clickGU: [4, 4], sensingGU: [6, 6]},
483
250
484
251
                {tag: "3x3GU size, no margins, click in visual", sizeGU: [3, 3], clickGU: [0, 0], sensingGU: [4, 4]},
485
252
                {tag: "3x3GU size, no margins, click in sensing", sizeGU: [3, 3], clickGU: [4, 4], sensingGU: [4, 4]},
486
253
                {tag: "3x3GU size, 1GU margins, click in visual", sizeGU: [3, 3], marginsGU: [1, 1, 1, 1], clickGU: [0, 0], sensingGU: [5, 5]},
487
254
                {tag: "3x3GU size, 1GU margins, click in sensing", sizeGU: [3, 3], marginsGU: [1, 1, 1, 1], clickGU: [4, 4], sensingGU: [5, 5]},
488
255
                {tag: "3x3GU size, 3GU margins horizontal, click in sensing", sizeGU: [3, 3], marginsGU: [3, 0, 3, 0], clickGU: [4, 4], sensingGU: [9, 4]},
489
256
                {tag: "3x3GU size, 3GU margins vertical, click in sensing", sizeGU: [3, 3], marginsGU: [0, 3, 0, 3], clickGU: [4, 4], sensingGU: [4, 9]},
490
257
                {tag: "3x3GU size, 3GU margins around, click in sensing", sizeGU: [3, 3], marginsGU: [3, 3, 3, 3], clickGU: [4, 4], sensingGU: [9, 9]},
491
258
492
259
                {tag: "5x5GU size, no margins, click in visual", sizeGU: [5, 5], clickGU: [0, 0], sensingGU: [5, 5]},
493
260
                {tag: "5x5GU size, no margins, click in sensing", sizeGU: [5, 5], clickGU: [4, 4], sensingGU: [5, 5]},
494
261
                {tag: "5x5GU size, 1GU margins, click in visual", sizeGU: [5, 5], marginsGU: [1, 1, 1, 1], clickGU: [0, 0], sensingGU: [7, 7]},
495
262
                {tag: "5x5GU size, 1GU margins, click in sensing", sizeGU: [5, 5], marginsGU: [1, 1, 1, 1], clickGU: [4, 4], sensingGU: [7, 7]},
496
263
                {tag: "5x5GU size, 3GU margins horizontal, click in sensing", sizeGU: [5, 5], marginsGU: [3, 0, 3, 0], clickGU: [4, 4], sensingGU: [11, 5]},
497
264
                {tag: "5x5GU size, 3GU margins vertical, click in sensing", sizeGU: [5, 5], marginsGU: [0, 3, 0, 3], clickGU: [4, 4], sensingGU: [5, 11]},
498
265
                {tag: "5x5GU size, 3GU margins around, click in sensing", sizeGU: [5, 5], marginsGU: [3, 3, 3, 3], clickGU: [4, 4], sensingGU: [11, 11]},
499
266
500
267
                {tag: "zero size, no margins, click out of sensing area", sizeGU: [0, 0], clickGU: [5, 5], sensingGU: [4, 4], fail: true},
501
268
                {tag: "2x2GU size, no margins, click out of sensing area", sizeGU: [2, 2], clickGU: [5, 5], sensingGU: [4, 4], fail: true},
502
269
                {tag: "4x4GU size, no margins, click out of sensing area", sizeGU: [4, 4], clickGU: [5, 5], sensingGU: [4, 4], fail: true},
503
270
                {tag: "2x2GU size, 1GU margins around, click out of sensing area", sizeGU: [2, 2], marginsGU: [1, 1, 1, 1], clickGU: [5, 5], sensingGU: [4, 4], fail: true},
504
271
                {tag: "4x4GU size, 1GU margins around, click out of sensing area", sizeGU: [4, 4], marginsGU: [1, 1, 1, 1], clickGU: [6.1, 6.1], sensingGU: [6, 6], fail: true},
505
272
506
273
                // test margins.all
507
274
                {tag: "zero size, 5GU margins.all, click in sensing area", sizeGU: [0, 0], marginsAll: units.gu(5), clickGU: [5, 5], sensingGU: [10, 10]},
508
275
                {tag: "2x2 size, 2GU margins.all, click in sensing area", sizeGU: [2, 2], marginsAll: units.gu(2), clickGU: [6, 6], sensingGU: [6, 6]},
509
276
                {tag: "zero size, 5GU margins.all, click out of sensing area", sizeGU: [0, 0], marginsAll: units.gu(5), clickGU: [10.1, 10.1], sensingGU: [10, 10], fail: true},
510
277
                {tag: "2x2 size, 2GU margins.all, click out of sensing area", sizeGU: [2, 2], marginsAll: units.gu(2), clickGU: [6.1, 6.1], sensingGU: [6, 6], fail: true},
511
278
512
279
                // test negative margins
513
280
                {tag: "zero size, -1GU margins.all, click in sensing area", sizeGU: [0, 0], marginsAll: -units.gu(1), clickGU: [4, 4], sensingGU: [4, 4]},
514
281
                {tag: "2x2 size, -1GU margins.all, click in sensing area", sizeGU: [2, 2], marginsAll: -units.gu(1), clickGU: [4, 4], sensingGU: [4, 4]},
515
282
                {tag: "zero size, -1GU margins horizontal, click in sensing area", sizeGU: [0, 0], marginsGU: [-1, 0, -1, 0], clickGU: [4, 4], sensingGU: [4, 4]},
516
283
                {tag: "zero size, -1GU margins vertical, click in sensing area", sizeGU: [0, 0], marginsGU: [0, -1, 0, -1], clickGU: [4, 4], sensingGU: [4, 4]},
517
284
                {tag: "2x2 size, -1GU margins horizontal, click in sensing area", sizeGU: [2, 2], marginsGU: [-1, 0, -1, 0], clickGU: [4, 4], sensingGU: [4, 4]},
518
285
                {tag: "2x2 size, -1GU margins vertical, click in sensing area", sizeGU: [2, 2], marginsGU: [0, -1, 0, -1], clickGU: [4, 4], sensingGU: [4, 4]},
519
286
                {tag: "4x4 size, -1GU margins.all, click in sensing area", sizeGU: [4, 4], marginsAll: -units.gu(1), clickGU: [4, 4], sensingGU: [4, 4]},
520
287
                {tag: "4x4 size, -1GU margins horizontal, click in sensing area", sizeGU: [4, 4], marginsGU: [-1, 0, -1, 0], clickGU: [4, 4], sensingGU: [4, 4]},
521
288
                {tag: "4x4 size, -1GU margins vertical, click in sensing area", sizeGU: [4, 4], marginsGU: [0, -1, 0, -1], clickGU: [4, 4], sensingGU: [4, 4]},
522
289
523
290
                // bigger size than minimum, decrease sensing area
524
291
                {tag: "5x5 size, -1GU margins.all, click in sensing area", sizeGU: [5, 5], marginsAll: -units.gu(1), clickGU: [4, 4], sensingGU: [4, 4]},
525
292
                {tag: "5x5 size, -1GU margins horizontal, click in sensing area", sizeGU: [5, 5], marginsGU: [-1, 0, -1, 0], clickGU: [4, 5], sensingGU: [4, 5]},
526
293
                {tag: "5x5 size, -1GU margins vertical, click in sensing area", sizeGU: [5, 5], marginsGU: [0, -1, 0, -1], clickGU: [5, 4], sensingGU: [5, 4]},
527
294
            ];
528
295
        }
529
296
        function test_sensing_area(data) {
530
297
            signalSpy.target = buttonWithSensing;
531
298
            buttonWithSensing.objectName = data.tag;
532
299
            buttonWithSensing.width = units.gu(data.sizeGU[0]);
533
300
            buttonWithSensing.height = units.gu(data.sizeGU[1]);
534
301
            if (data.marginsGU) {
535
302
                buttonWithSensing.sensingMargins.left = units.gu(data.marginsGU[0]);
536
303
                buttonWithSensing.sensingMargins.top = units.gu(data.marginsGU[1]);
537
304
                buttonWithSensing.sensingMargins.right = units.gu(data.marginsGU[2]);
538
305
                buttonWithSensing.sensingMargins.bottom = units.gu(data.marginsGU[3]);
539
306
            } else if (data.marginsAll) {
540
307
                buttonWithSensing.sensingMargins.all = data.marginsAll;
541
308
            }
542
309
543
310
            if (data.sensingGU) {
544
311
                compare(buttonWithSensing.__mouseArea.width, units.gu(data.sensingGU[0]), "unexpected horizontal sensing size");
545
312
                compare(buttonWithSensing.__mouseArea.height, units.gu(data.sensingGU[1]), "unexpected vertical sensing size");
546
313
            }
547
314
            if (data.fail) {
548
315
                expectFailContinue(data.tag, "no signal");
549
316
            }
550
317
            mouseClick(buttonWithSensing.__mouseArea, units.gu(data.clickGU[0]), units.gu(data.clickGU[1]));
551
318
            signalSpy.wait(500);
552
319
        }
553
320
554
321
        function test_predeclared_sensing_area() {
555
322
            var point = centerOf(increasedSensing.parent);
556
323
            // move the point to the edge of the sensing area
557
324
            point.x -= increasedSensing.sensingMargins.left;
558
325
            point.y -= increasedSensing.sensingMargins.top;
559
326
            // click
560
327
            signalSpy.target = increasedSensing;
561
328
            mouseClick(increasedSensing.parent, point.x, point.y);
562
329
            signalSpy.wait(500);
563
330
        }
564
187
    }
331
    }
565
188
}
332
}
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-02-24
Tim Peeters		2015-11-13	Approve on 2016-02-24
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-20
Review via email: mp+277450@code.launchpad.net