1
=== modified file 'components.api'
2
--- components.api	2014-04-01 12:57:27 +0000
3
+++ components.api	2014-04-10 09:56:33 +0000
4
@@ -45,6 +45,16 @@
5
45
    readonly property color coolGrey
45
    readonly property color coolGrey
6
46
    property Gradient orangeGradient
46
    property Gradient orangeGradient
7
47
    property Gradient greyGradient
47
    property Gradient greyGradient
8
48
modules/Ubuntu/Components/ComboButton.qml
9
49
Button
10
50
    property bool expanded
11
51
    property bool autoCollapse
12
52
    property real collapsedHeight
13
53
    property real expandedHeight
14
54
    readonly property real comboListHeight
15
55
    default property list<Item> comboList
16
56
    property color dropdownColorPressed
17
57
    property color dropdownColorReleased
18
48
modules/Ubuntu/Components/CrossFadeImage.qml
58
modules/Ubuntu/Components/CrossFadeImage.qml
19
49
Item
59
Item
20
50
    property url source
60
    property url source
21
@@ -593,6 +603,8 @@
22
593
    function findChild(obj,objectName)
603
    function findChild(obj,objectName)
23
594
    function findInvisibleChild(obj,objectName)
604
    function findInvisibleChild(obj,objectName)
24
595
    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
605
    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
25
606
    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
26
607
    function mouseLongPress(item, x, y, button, modifiers, delay)
27
596
    function tryCompareFunction(func, expectedResult, timeout)
608
    function tryCompareFunction(func, expectedResult, timeout)
28
597
plugins.qmltypes
609
plugins.qmltypes
29
598
    name: "InverseMouseAreaType"
610
    name: "InverseMouseAreaType"
30
599
611
31
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
32
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-03-04 12:16:38 +0000
33
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-10 09:56:33 +0000
34
@@ -16,6 +16,7 @@
35
16
16
36
17
import QtQuick 2.0
17
import QtQuick 2.0
37
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
38
19
import Ubuntu.Components.ListItems 0.1
39
19
20
40
20
Template {
21
Template {
41
21
    objectName: "buttonsTemplate"
22
    objectName: "buttonsTemplate"
42
@@ -80,4 +81,67 @@
43
80
            }
81
            }
44
81
        }
82
        }
45
82
    }
83
    }
46
84
47
85
    TemplateSection {
48
86
        className: "ComboButton"
49
87
50
88
        TemplateRow {
51
89
            title: i18n.tr("Collapsed")
52
90
53
91
            ComboButton {
54
92
                text: "Press me"
55
93
                objectName: "combobutton_collapsed"
56
94
                comboList:  UbuntuListView {
57
95
                    model: 10
58
96
                    delegate: Standard {
59
97
                        text: "item #" + modelData
60
98
                    }
61
99
                }
62
100
            }
63
101
        }
64
102
65
103
        TemplateRow {
66
104
            title: i18n.tr("Icon")
67
105
68
106
            ComboButton {
69
107
                iconSource: "call.png"
70
108
                comboList:  UbuntuListView {
71
109
                    model: 10
72
110
                    delegate: Standard {
73
111
                        text: "item #" + modelData
74
112
                    }
75
113
                }
76
114
            }
77
115
        }
78
116
79
117
        TemplateRow {
80
118
            title: i18n.tr("Icon+Text")
81
119
82
120
            ComboButton {
83
121
                text: "Answer"
84
122
                iconSource: "call.png"
85
123
                comboList:  UbuntuListView {
86
124
                    model: 10
87
125
                    delegate: Standard {
88
126
                        text: "item #" + modelData
89
127
                    }
90
128
                }
91
129
            }
92
130
        }
93
131
        TemplateRow {
94
132
            title: i18n.tr("Expanded")
95
133
96
134
            ComboButton {
97
135
                text: "Press me"
98
136
                objectName: "combobutton_expanded"
99
137
                expanded: true
100
138
                comboList:  UbuntuListView {
101
139
                    model: 10
102
140
                    delegate: Standard {
103
141
                        text: "item #" + modelData
104
142
                    }
105
143
                }
106
144
            }
107
145
        }
108
146
    }
109
83
}
147
}
110
84
148
111
=== modified file 'modules/Ubuntu/Components/Button.qml'
112
--- modules/Ubuntu/Components/Button.qml	2013-11-06 22:52:15 +0000
113
+++ modules/Ubuntu/Components/Button.qml	2014-04-10 09:56:33 +0000
114
@@ -83,6 +83,11 @@
115
83
    property Gradient gradient: __styleInstance.defaultGradient
83
    property Gradient gradient: __styleInstance.defaultGradient
116
84
84
117
85
    /*!
85
    /*!
118
86
      The font used for the button's text.
119
87
    */
120
88
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
121
89
122
90
    /*!
123
86
       The source URL of the icon to display inside the button.
91
       The source URL of the icon to display inside the button.
124
87
       Leave this value blank for a text-only button.
92
       Leave this value blank for a text-only button.
125
88
       If \l action is set, the default iconSource is that of the action.
93
       If \l action is set, the default iconSource is that of the action.
126
89
94
127
=== added file 'modules/Ubuntu/Components/ComboButton.qml'
128
--- modules/Ubuntu/Components/ComboButton.qml	1970-01-01 00:00:00 +0000
129
+++ modules/Ubuntu/Components/ComboButton.qml	2014-04-10 09:56:33 +0000
130
@@ -0,0 +1,383 @@
131
1
/*
132
2
 * Copyright 2014 Canonical Ltd.
133
3
 *
134
4
 * This program is free software; you can redistribute it and/or modify
135
5
 * it under the terms of the GNU Lesser General Public License as published by
136
6
 * the Free Software Foundation; version 3.
137
7
 *
138
8
 * This program is distributed in the hope that it will be useful,
139
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
140
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
141
11
 * GNU Lesser General Public License for more details.
142
12
 *
143
13
 * You should have received a copy of the GNU Lesser General Public License
144
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
145
15
 */
146
16
147
17
import QtQuick 2.0
148
18
import Ubuntu.Components.Popups 0.1
149
19
import "mathUtils.js" as MathUtils
150
20
151
21
/*!
152
22
    \qmltype ComboButton
153
23
    \inqmlmodule Ubuntu.Components 0.1
154
24
    \ingroup ubuntu
155
25
    \brief Ubuntu button providing a drop-down panel visualizing custom options.
156
26
157
27
    The component is composed of three main blocks: \b {main button}, \b {dropdown}
158
28
    and \b {combo list}.
159
29
160
30
    The \a {main button} holds the main functionailty of the component, and it is
161
31
    located at the left-top side of the expanded button. The \a clicked() signal
162
32
    is triggered only when this button is pressed.
163
33
164
34
    The \a {dropdown} is a button located on the top-right side of the expanded
165
35
    component. Its functionality is to drive the component's expanded state.
166
36
167
37
    The \a {combo list} is a panel showing the content specified in \l comboList
168
38
    property when expanded. The content is stretched horizontally to the component's
169
39
    width, and its height is controlled by the \l expandedHeight property as follows:
170
40
    \list
171
41
    \li If the content height is smaller than the value of \l expandedHeight, the combo
172
42
        list will be expanded only to the height of the content.
173
43
        \qml
174
44
        import QtQuick 2.0
175
45
        import Ubuntu.Components 0.1
176
46
        ComboButton {
177
47
            text: "smaller content"
178
48
            Rectangle {
179
49
                height: units.gu(5) // smaller than the default expandedHeight
180
50
                color: "blue"
181
51
            }
182
52
        }
183
53
        \endqml
184
54
    \li If the content height is greater than \l expandedHeight, the combo list will
185
55
        expand till the height specified by the property and the content will be
186
56
        scrolled; in case the combo list content is one single Flickable, ListView,
187
57
        GridView or PathView, the content scrolling will be provided by the content
188
58
        itself.
189
59
        \qml
190
60
        import QtQuick 2.0
191
61
        import Ubuntu.Components 0.1
192
62
        ComboButton {
193
63
            text: "long scrolled content"
194
64
            Column {
195
65
                Repeater {
196
66
                    model: 5
197
67
                    spacing: units.gu(1)
198
68
                    Rectangle {
199
69
                        height: units.gu(5)
200
70
                        color: "blue"
201
71
                    }
202
72
                }
203
73
            }
204
74
        }
205
75
        \endqml
206
76
    \li In case the content is a single Flickable, ListView, GridView or PathView,
207
77
        the content will be filling the entire combo list area defined.
208
78
        \qml
209
79
        import QtQuick 2.0
210
80
        import Ubuntu.Components 0.1
211
81
        import Ubuntu.Components.ListItems 0.1
212
82
        ComboButton {
213
83
            text: "listview"
214
84
            ListView {
215
85
                model: 10
216
86
                delegate: Standard {
217
87
                    text: "Item #" + modelData
218
88
                }
219
89
            }
220
90
        }
221
91
        \endqml
222
92
    \li Vertical anchoring of combo list content to its parent is not possible
223
93
        as the expansion calculation is done based on the combo list content height.
224
94
        If the content wants to take the size of the entire combo list, it should
225
95
        bind its height to the \l comboListHeight property.
226
96
        \qml
227
97
        import QtQuick 2.0
228
98
        import Ubuntu.Components 0.1
229
99
        ComboButton {
230
100
            id: combo
231
101
            text: "smaller content"
232
102
            Rectangle {
233
103
                height: combo.comboListHeight
234
104
                color: "blue"
235
105
            }
236
106
        }
237
107
        \endqml
238
108
    \li In case the expansion needs to be the size of the combo list content, the \l
239
109
        expandedHeight should be set to -1.
240
110
        \qml
241
111
        import QtQuick 2.0
242
112
        import Ubuntu.Components 0.1
243
113
        ComboButton {
244
114
            text: "auto-sized content"
245
115
            expandedHeight: -1
246
116
            Column {
247
117
                Repeater {
248
118
                    model: 5
249
119
                    spacing: units.gu(1)
250
120
                    Rectangle {
251
121
                        height: units.gu(5)
252
122
                        color: "blue"
253
123
                    }
254
124
                }
255
125
            }
256
126
        }
257
127
        \endqml
258
128
    \endlist
259
129
260
130
    As combo list content is unknown for the component, eventual collapsing when
261
131
    an action selected from the combo list holder must be driven manually. Also,
262
132
    the default action of the main button can be changed in this way.
263
133
264
134
    \qml
265
135
    import QtQuick 2.0
266
136
    import Ubuntu.Components 0.1
267
137
268
138
    ComboButton {
269
139
        id: combo
270
140
        text: "Auto closing"
271
141
        expanded: true
272
142
        expandedHeight: units.gu(30)
273
143
        UbuntuListView {
274
144
            width: parent.width
275
145
            height: combo.comboListHeight
276
146
            model: 20
277
147
            delegate: Standard {
278
148
                text: "Action #" + modelData
279
149
                onClicked: {
280
150
                    combo.text = text;
281
151
                    combo.expanded = false;
282
152
                }
283
153
            }
284
154
        }
285
155
    }
286
156
    \endqml
287
157
288
158
    The style of the component is defined in \l ComboButtonStyle.
289
159
  */
290
160
Button {
291
161
    id: combo
292
162
293
163
    /*!
294
164
      Specifies whether the combo list is expanded or not. The default falue is
295
165
      false.
296
166
      */
297
167
    property bool expanded: false
298
168
299
169
    /*!
300
170
      The property specifies whether to collapse the expanded combo list when
301
171
      the main button is clicked. The default value is true.
302
172
      */
303
173
    property bool autoCollapse: true
304
174
305
175
    /*!
306
176
      The property holds the height of the component when collapsed. By default
307
177
      the value is the implicit height of the component.
308
178
      */
309
179
    property real collapsedHeight: implicitHeight
310
180
311
181
    /*!
312
182
        The property holds the maximum height value the component should expand.
313
183
        When setting the property, remember to take into account the \l collapsedHeight
314
184
        value. The best practice is to use bind it with collapsedHeight.
315
185
        \qml
316
186
        ComboButton {
317
187
            text: "altered expandedHeight"
318
188
            expandedHeight: collapsedHeight + units.gu(25)
319
189
        }
320
190
        \endqml
321
191
322
192
        A value of -1 will instruct the component to expand the combo list as
323
193
        much as its content height is.
324
194
325
195
        The default value is \l collapsedHeight + 19.5 GU.
326
196
        \sa collapsedHeight
327
197
      */
328
198
    property real expandedHeight: collapsedHeight + units.gu(19.5)
329
199
330
200
    /*!
331
201
      The property holds the maximum combo list height allowed based on the
332
202
      \l expandedHeight and \l collapsedHeight values. It is a convenience property
333
203
      that can be used to size the combo list content.
334
204
      \qml
335
205
      import QtQuick 2.0
336
206
      import Ubuntu.Components 0.1
337
207
      import Ubuntu.Components.ListItems 0.1
338
208
      ComboButton {
339
209
          id: combo
340
210
          text: "Full comboList size"
341
211
          ListView {
342
212
              anchors {
343
213
                  left: parent.left
344
214
                  right: parent.right
345
215
              }
346
216
              height: combo.comboListHeight
347
217
              model: 20
348
218
              delegate: Standard {
349
219
                  text: "Action #" + modelData
350
220
              }
351
221
          }
352
222
      }
353
223
      \endqml
354
224
355
225
      \sa collapsedHeight, expandedHeight
356
226
      */
357
227
    readonly property real comboListHeight: (expandedHeight < 0) ?
358
228
                            comboListHolder.height :
359
229
                            (expandedHeight - collapsedHeight -
360
230
                            (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
361
231
362
232
    /*!
363
233
        \qmlproperty list<Item> comboList
364
234
        \default
365
235
        Property holding the list of items to be shown in the combo list. Being
366
236
        a default property children items declared will land in the combo list.
367
237
        \note The component is not responsible for layouting the content. It only
368
238
        provides scrolling abilities for the case the content exceeds the defined
369
239
        expanded height.
370
240
      */
371
241
    default property alias comboList: comboListHolder.data
372
242
373
243
    /* ----------------- Color and font configurations ----------------- */
374
244
    /*!
375
245
      The property specifies the color of the dropdown button when expanded.
376
246
      */
377
247
    property color dropdownColorPressed: __styleInstance ? __styleInstance.defaultDropdownColorPressed : color
378
248
379
249
    /*!
380
250
      The property specifies the color of the dropdown button when collapsed.
381
251
      */
382
252
    property color dropdownColorReleased: __styleInstance ? __styleInstance.defaultDropdownColorReleased : color
383
253
384
254
    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
385
255
386
256
    // auto-collapse
387
257
    /*! \internal */
388
258
    onClicked: {
389
259
        if (autoCollapse) {
390
260
            expanded = false;
391
261
        }
392
262
    }
393
263
394
264
    Component.onCompleted: {
395
265
        // update mouse area to report clicks only on the main button area
396
266
        // area excluding dropDown button and combo list
397
267
        // we must do separate bindings as __mouseArea is a read-only property
398
268
        __mouseArea.anchors.fill = undefined;
399
269
        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
400
270
        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
401
271
        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
402
272
        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
403
273
        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
404
274
        // for autopilot, set the main button name
405
275
        __mouseArea.objectName = "combobutton_mainbutton";
406
276
407
277
        // bind a height calculation to avoid unwanted change
408
278
        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
409
279
    }
410
280
411
281
    // dropdown button
412
282
    MouseArea {
413
283
        id: dropDown
414
284
        objectName: "combobutton_dropdown"
415
285
        anchors {
416
286
            right: parent.right
417
287
            top: parent.top
418
288
        }
419
289
        width: combo.__styleInstance ? combo.__styleInstance.dropDownWidth : 0
420
290
        height: combo.collapsedHeight
421
291
        // open dropdown when pressed, not when clicked
422
292
        onPressed: {
423
293
            // toggle expanded
424
294
            combo.expanded = !combo.expanded;
425
295
        }
426
296
    }
427
297
428
298
    // expansion list
429
299
    Flickable {
430
300
        id: comboHolder
431
301
        parent: combo.__styleInstance ? combo.__styleInstance.comboList : combo
432
302
        anchors.fill: parent
433
303
        interactive: combo.expanded && !contentIsFlickable() && (combo.expandedHeight > 0)
434
304
        flickableDirection: Flickable.VerticalFlick
435
305
        contentHeight: comboListHolder.height
436
306
437
307
        // consider PathView as Flickable in this case as well!
438
308
        function contentIsFlickable() {
439
309
            return (comboListHolder.children.length === 1) &&
440
310
                    comboListHolder.children[0].hasOwnProperty("flicking");
441
311
        }
442
312
443
313
        Item {
444
314
            id: comboListHolder
445
315
            objectName: "combobutton_combolist"
446
316
            anchors {
447
317
                left: parent.left
448
318
                right: parent.right
449
319
            }
450
320
451
321
            // stretch children width to holder's width
452
322
            // must do binding to height manually to avoid binding loops caused
453
323
            // by the vertical stretching when the component is a single flickable
454
324
            property bool anchorFill: (combo.expandedHeight > 0 && comboHolder.contentIsFlickable())
455
325
            onAnchorFillChanged: stretchChildren()
456
326
            onChildrenChanged: stretchChildren()
457
327
            function stretchChildren() {
458
328
                for (var i in comboListHolder.children) {
459
329
                    var child = comboListHolder.children[i];
460
330
                    if (comboListHolder.anchorFill) {
461
331
                        child.anchors.left = undefined;
462
332
                        child.anchors.right = undefined;
463
333
                        child.anchors.fill = comboListHolder;
464
334
                        comboListHolder.height = Qt.binding(function() {
465
335
                            return combo.comboListHeight;
466
336
                        });
467
337
                    } else {
468
338
                        child.anchors.left = comboListHolder.left;
469
339
                        child.anchors.right = comboListHolder.right;
470
340
                        comboListHolder.height = Qt.binding(function() {
471
341
                            return comboListHolder.childrenRect.height;
472
342
                        });
473
343
                    }
474
344
                }
475
345
            }
476
346
        }
477
347
    }
478
348
    Scrollbar {
479
349
        flickableItem: comboHolder
480
350
    }
481
351
482
352
    // drive the expansion height of the combo list holder
483
353
    Binding {
484
354
        target: combo.__styleInstance.comboListPanel
485
355
        property: "height"
486
356
        value: {
487
357
            if (!expanded) {
488
358
                return 0;
489
359
            }
490
360
            if (comboListHolder.anchorFill) {
491
361
                return combo.comboListHeight + combo.__styleInstance.comboListMargin;
492
362
            }
493
363
494
364
            var h = comboListHolder.height;
495
365
            var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
496
366
            if (combo.expandedHeight < 0) {
497
367
                return max;
498
368
            }
499
369
500
370
            return MathUtils.clamp(h, 0, max);
501
371
        }
502
372
    }
503
373
    // for testing purposes only
504
374
    Binding {
505
375
        target: combo.__styleInstance.comboListPanel
506
376
        property: "objectName"
507
377
        value: "combobutton_combopanel"
508
378
    }
509
379
510
380
    /*! \internal */
511
381
    // on style change, update the visual's names so we can access it when testing
512
382
    onStyleChanged: if (__styleInstance) __styleInstance.dropdownButtonVisuals.objectName = "combobutton_dropdow_visuals"
513
383
}
514
0
384
515
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
516
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2013-07-01 22:26:49 +0000
517
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-10 09:56:33 +0000
518
@@ -30,6 +30,7 @@
519
30
    property real spacing
30
    property real spacing
520
31
    property bool hasIcon: iconSource != ""
31
    property bool hasIcon: iconSource != ""
521
32
    property bool hasText: text != ""
32
    property bool hasText: text != ""
522
33
    property alias font: label.font
523
33
34
524
34
    opacity: enabled ? 1.0 : 0.5
35
    opacity: enabled ? 1.0 : 0.5
525
35
    implicitHeight: Math.max(icon.height, label.height)
36
    implicitHeight: Math.max(icon.height, label.height)
526
36
37
527
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
528
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-02-04 22:07:10 +0000
529
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-10 09:56:33 +0000
530
@@ -26,7 +26,10 @@
531
26
    property real minimumWidth: units.gu(10)
26
    property real minimumWidth: units.gu(10)
532
27
    property real horizontalPadding: units.gu(1)
27
    property real horizontalPadding: units.gu(1)
533
28
    property color defaultColor: UbuntuColors.orange
28
    property color defaultColor: UbuntuColors.orange
534
29
    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
535
29
    property Gradient defaultGradient
30
    property Gradient defaultGradient
536
31
    property real buttonFaceOffset: 0
537
32
    property Item backgroundSource: null
538
30
33
539
31
    width: button.width
34
    width: button.width
540
32
    height: button.height
35
    height: button.height
541
@@ -40,8 +43,9 @@
542
40
       non-NOTIFYable properties. They cannot be written to so it is fine but
43
       non-NOTIFYable properties. They cannot be written to so it is fine but
543
41
       the proxy avoids the warnings.
44
       the proxy avoids the warnings.
544
42
    */
45
    */
545
46
    property QtObject gradientProxy: gradientProxyObject
546
43
    QtObject {
47
    QtObject {
548
44
        id: gradientProxy
48
        id: gradientProxyObject
549
45
        property color topColor
49
        property color topColor
550
46
        property color bottomColor
50
        property color bottomColor
551
47
51
552
@@ -67,7 +71,8 @@
553
67
        id: background
71
        id: background
554
68
        anchors.fill: parent
72
        anchors.fill: parent
555
69
        borderSource: "radius_idle.sci"
73
        borderSource: "radius_idle.sci"
557
70
        visible: color.a != 0.0
74
        visible: (color.a != 0.0) || backgroundSource
558
75
        image: backgroundSource
559
71
76
560
72
        // Color properties in a JS ternary operator don't work as expected in
77
        // Color properties in a JS ternary operator don't work as expected in
561
73
        // QML because it overwrites alpha values with 1. A workaround is to use
78
        // QML because it overwrites alpha values with 1. A workaround is to use
562
@@ -75,8 +80,8 @@
563
75
        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
80
        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
564
76
        // https://bugreports.qt-project.org/browse/QTBUG-32238.
81
        // https://bugreports.qt-project.org/browse/QTBUG-32238.
565
77
        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
82
        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
568
78
        color: isGradient ? colorHack(gradientProxy.topColor) : colorHack(button.color)
83
        color: backgroundSource ? "#00000000" : (isGradient ? colorHack(gradientProxy.topColor) : colorHack(button.color))
569
79
        gradientColor: isGradient ? colorHack(gradientProxy.bottomColor) : colorHack(button.color)
84
        gradientColor: backgroundSource ? "#00000000" : (isGradient ? colorHack(gradientProxy.bottomColor) : colorHack(button.color))
570
80
    }
85
    }
571
81
86
572
82
    UbuntuShape {
87
    UbuntuShape {
573
@@ -98,7 +103,10 @@
574
98
    ButtonForeground {
103
    ButtonForeground {
575
99
        id: foreground
104
        id: foreground
576
100
        width: parent.width - 2*horizontalPadding
105
        width: parent.width - 2*horizontalPadding
578
101
        anchors.centerIn: parent
106
        anchors {
579
107
            centerIn: parent
580
108
            horizontalCenterOffset: buttonFaceOffset
581
109
        }
582
102
        text: button.text
110
        text: button.text
583
103
        /* Pick either a clear or dark text color depending on the luminance of the
111
        /* Pick either a clear or dark text color depending on the luminance of the
584
104
           background color to maintain good contrast (works in most cases)
112
           background color to maintain good contrast (works in most cases)
585
@@ -107,6 +115,7 @@
586
107
        iconSource: button.iconSource
115
        iconSource: button.iconSource
587
108
        iconPosition: button.iconPosition
116
        iconPosition: button.iconPosition
588
109
        iconSize: units.gu(3)
117
        iconSize: units.gu(3)
589
118
        font: button.font
590
110
        spacing: horizontalPadding
119
        spacing: horizontalPadding
591
111
        transformOrigin: Item.Top
120
        transformOrigin: Item.Top
592
112
        scale: button.pressed ? 0.98 : 1.0
121
        scale: button.pressed ? 0.98 : 1.0
593
113
122
594
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
595
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	1970-01-01 00:00:00 +0000
596
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-10 09:56:33 +0000
597
@@ -0,0 +1,251 @@
598
1
/*
599
2
 * Copyright 2014 Canonical Ltd.
600
3
 *
601
4
 * This program is free software; you can redistribute it and/or modify
602
5
 * it under the terms of the GNU Lesser General Public License as published by
603
6
 * the Free Software Foundation; version 3.
604
7
 *
605
8
 * This program is distributed in the hope that it will be useful,
606
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
607
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
608
11
 * GNU Lesser General Public License for more details.
609
12
 *
610
13
 * You should have received a copy of the GNU Lesser General Public License
611
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
612
15
 */
613
16
614
17
import QtQuick 2.0
615
18
import Ubuntu.Components 0.1
616
19
617
20
/*!
618
21
    The component defines the style of the ComboButton component.
619
22
  */
620
23
Item {
621
24
    id: comboStyle
622
25
623
26
    /*!
624
27
      Width of the drop down button.
625
28
      */
626
29
    property real dropDownWidth: units.gu(5)
627
30
628
31
    /*!
629
32
      Width of the dropdown button separator.
630
33
      */
631
34
    property real dropDownSeparatorWidth: units.dp(2)
632
35
633
36
    /*!
634
37
      Distance between the combo list and the main button.
635
38
      */
636
39
    property real comboListMargin: units.gu(0.8)
637
40
638
41
    /*!
639
42
      The item which will hold the combo list data.
640
43
      */
641
44
    property Item comboList: comboListContent
642
45
643
46
    /*!
644
47
      The item pointing to the panel holding the combo list and additional design
645
48
      artifacts. It is used by the component to drive the expansion size.
646
49
      */
647
50
    property Item comboListPanel: panelItem
648
51
649
52
    /*!
650
53
      \qmlproperty color defaultColor
651
54
      Default color for the main button.
652
55
      */
653
56
    property alias defaultColor: mainButton.defaultColor
654
57
655
58
    /*!
656
59
      \qmlproperty Gradient defaultGradient
657
60
      Default gradient for the main button.
658
61
      */
659
62
    property alias defaultGradient: mainButton.defaultGradient
660
63
661
64
    /*!
662
65
      Default color for the dropdown button when released.
663
66
      */
664
67
    property color defaultDropdownColorReleased: defaultColor
665
68
    /*!
666
69
      Default color for dropdown button when pressed.
667
70
      */
668
71
    property color defaultDropdownColorPressed: Qt.rgba(0, 0, 0, 0.05)
669
72
    /*!
670
73
      Default button face font.
671
74
      */
672
75
    property alias defaultFont: mainButton.defaultFont
673
76
674
77
    /*!
675
78
      The property holds the Item implementing the visuals of the dropdown button.
676
79
      */
677
80
    property alias dropdownButtonVisuals: dropDownButton
678
81
679
82
    width: combo.width
680
83
    height: combo.collapsedHeight
681
84
682
85
    /*! \internal */
683
86
    property ComboButton combo: styledItem
684
87
685
88
    implicitWidth: mainButton.implicitWidth
686
89
    implicitHeight: mainButton.implicitHeight
687
90
688
91
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
689
92
    LayoutMirroring.childrenInherit: true
690
93
691
94
    // Color properties in a JS ternary operator don't work as expected in
692
95
    // QML because it overwrites alpha values with 1. A workaround is to use
693
96
    // Qt.rgba(). For more information, see
694
97
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
695
98
    // https://bugreports.qt-project.org/browse/QTBUG-32238.
696
99
    /*! \internal */
697
100
    function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
698
101
699
102
    ButtonStyle {
700
103
        id: mainButton
701
104
        anchors {
702
105
            left: parent.left
703
106
            top: parent.top
704
107
            right: parent.right
705
108
        }
706
109
        height: combo.collapsedHeight
707
110
        // overrides
708
111
        backgroundSource: comboFace
709
112
        buttonFaceOffset: -dropDownWidth/2 - dropDownSeparatorWidth
710
113
        horizontalPadding: units.gu(4) - dropDownSeparatorWidth
711
114
        minimumWidth: units.gu(36)
712
115
713
116
        // FIXME: use hardcoded color while we get the theme palette updated
714
117
        defaultColor: "#b2b2b2"
715
118
        defaultGradient: null
716
119
717
120
        // button face
718
121
        ShaderEffectSource {
719
122
            id: comboFace
720
123
            sourceItem: content
721
124
            hideSource: true
722
125
            // FIXME: visible: false prevents rendering so make it a nearly
723
126
            // transparent 1x1 pixel instead
724
127
            opacity: 0.01
725
128
            width: 1
726
129
            height: 1
727
130
        }
728
131
729
132
        Item {
730
133
            id: content
731
134
            width: mainButton.width
732
135
            height: mainButton.height
733
136
734
137
            Rectangle {
735
138
                anchors {
736
139
                    fill: parent
737
140
                    rightMargin: comboStyle.dropDownSeparatorWidth + comboStyle.dropDownWidth
738
141
                }
739
142
                color: combo.color
740
143
                gradient: mainButton.isGradient ? combo.gradient : null
741
144
            }
742
145
743
146
            // distancer
744
147
            Item {
745
148
                anchors {
746
149
                    right: dropDownButton.right
747
150
                    top: parent.top
748
151
                    bottom: parent.bottom
749
152
                }
750
153
                width: comboStyle.dropDownSeparatorWidth
751
154
            }
752
155
753
156
            Rectangle {
754
157
                id: dropDownButton
755
158
                objectName: "combobutton_dropdown_visuals"
756
159
                anchors {
757
160
                    right: parent.right
758
161
                    top: parent.top
759
162
                    bottom: parent.bottom
760
163
                }
761
164
                width: comboStyle.dropDownWidth
762
165
                color: combo.expanded ? comboStyle.colorHack(combo.dropdownColorPressed) : comboStyle.colorHack(combo.dropdownColorReleased)
763
166
                Image {
764
167
                    source: "artwork/chevron.png"
765
168
                    anchors.centerIn: parent
766
169
                    rotation: combo.expanded ? -90 : 90
767
170
                }
768
171
            }
769
172
        }
770
173
    }
771
174
772
175
    Item {
773
176
        id: panelItem
774
177
        anchors {
775
178
            left: parent.left
776
179
            top: mainButton.bottom
777
180
            right: parent.right
778
181
        }
779
182
        opacity: combo.expanded && (combo.comboList.length > 0)? 1.0 : 0.0
780
183
781
184
        ShaderEffectSource {
782
185
            id: listContent
783
186
            sourceItem: comboListContent
784
187
            hideSource: true
785
188
            // FIXME: visible: false prevents rendering so make it a nearly
786
189
            // transparent 1x1 pixel instead
787
190
            opacity: 0.01
788
191
            width: 1
789
192
            height: 1
790
193
        }
791
194
        Rectangle {
792
195
            id: comboListContent
793
196
            anchors {
794
197
                fill: parent
795
198
                topMargin: comboListMargin
796
199
            }
797
200
            clip: true
798
201
            color: comboStyle.dropDownColorPressed
799
202
        }
800
203
801
204
        BorderImage {
802
205
            id: shadow
803
206
            anchors {
804
207
                fill: parent
805
208
                leftMargin: -units.gu(0.5)
806
209
                topMargin: comboListMargin - units.gu(0.5)
807
210
                rightMargin: -units.gu(0.5)
808
211
                bottomMargin: -units.gu(0.5)
809
212
            }
810
213
            source: "artwork/bubble_shadow.sci"
811
214
        }
812
215
        UbuntuShape {
813
216
            id: shape
814
217
            anchors {
815
218
                fill: parent
816
219
                topMargin: comboListMargin
817
220
            }
818
221
            visible: true
819
222
            borderSource: "radius_idle.sci"
820
223
            image: listContent
821
224
        }
822
225
823
226
        Image {
824
227
            source: "artwork/bubble_arrow.png"
825
228
            rotation: 180
826
229
            anchors {
827
230
                bottom: shape.top
828
231
                bottomMargin: -1
829
232
                right: parent.right
830
233
                rightMargin: dropDownWidth / 2 - units.gu(0.5)
831
234
            }
832
235
833
236
        }
834
237
835
238
        Behavior on height {
836
239
            NumberAnimation {
837
240
                duration: UbuntuAnimation.FastDuration
838
241
                easing: UbuntuAnimation.StandardEasing
839
242
            }
840
243
        }
841
244
        Behavior on opacity {
842
245
            NumberAnimation {
843
246
                duration: UbuntuAnimation.FastDuration
844
247
                easing: UbuntuAnimation.StandardEasing
845
248
            }
846
249
        }
847
250
    }
848
251
}
849
0
252
850
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
851
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2013-12-04 10:47:19 +0000
852
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-04-10 09:56:33 +0000
853
@@ -26,3 +26,4 @@
854
26
DialerStyle 0.1 DialerStyle.qml
26
DialerStyle 0.1 DialerStyle.qml
855
27
DialerHandStyle 0.1 DialerHandStyle.qml
27
DialerHandStyle 0.1 DialerHandStyle.qml
856
28
internal HighlightMagnifier HighlightMagnifier.qml
28
internal HighlightMagnifier HighlightMagnifier.qml
857
29
ComboButtonStyle 0.1 ComboButtonStyle.qml
858
29
30
859
=== modified file 'modules/Ubuntu/Components/qmldir'
860
--- modules/Ubuntu/Components/qmldir	2014-02-13 11:48:38 +0000
861
+++ modules/Ubuntu/Components/qmldir	2014-04-10 09:56:33 +0000
862
@@ -44,6 +44,7 @@
863
44
ColorUtils 0.1 colorUtils.js
44
ColorUtils 0.1 colorUtils.js
864
45
DateUtils 0.1 dateUtils.js
45
DateUtils 0.1 dateUtils.js
865
46
UbuntuListView 0.1 UbuntuListView.qml
46
UbuntuListView 0.1 UbuntuListView.qml
866
47
ComboButton 0.1 ComboButton.qml
867
47
48
868
48
internal TextCursor TextCursor.qml
49
internal TextCursor TextCursor.qml
869
49
internal TextInputPopover TextInputPopover.qml
50
internal TextInputPopover TextInputPopover.qml
870
50
51
871
=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
872
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-02-25 12:36:27 +0000
873
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-10 09:56:33 +0000
874
@@ -87,7 +87,75 @@
875
87
		}
87
		}
876
88
	}
88
	}
877
89
89
879
90
	/*!
90
    /*!
880
91
      \qmlmethod UbuntuTestCase::flick(item, x, y, dx, dy, pressTimeout = -1, steps = -1, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
881
92
882
93
      The function produces a flick event when executed on Flickables. When used
883
94
      on other components it provides the same functionality as \l mouseDrag()
884
95
      function. The optional \a pressTimeout parameter can be used to introduce
885
96
      a small delay between the mouse press and the first mouse move. Setting a
886
97
      negative or zero value will disable the timeout.
887
98
888
99
      The default flick velocity is built up using 5 move points. This can be altered
889
100
      by setting a positive value to \a steps parameter. The bigger the number the
890
101
      longer the flick will be. When a negative or zero value is given, the default
891
102
      of 5 move points will be used.
892
103
893
104
      \note The function can be used to select a text in a TextField or TextArea by
894
105
      specifying at least 400 millisecods to \a pressTimeout.
895
106
      */
896
107
    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay) {
897
108
        if (item === undefined || item.x === undefined || item.y === undefined)
898
109
            return
899
110
        if (button === undefined)
900
111
            button = Qt.LeftButton
901
112
        if (modifiers === undefined)
902
113
            modifiers = Qt.NoModifier
903
114
        if (steps === undefined || steps <= 0)
904
115
            steps = 4;
905
116
        // make sure we have at least two move steps so the flick will be sensed
906
117
        steps += 1;
907
118
        if (delay === undefined)
908
119
            delay = -1;
909
120
910
121
        var ddx = dx / steps;
911
122
        var ddy = dy / steps;
912
123
913
124
        mousePress(item, x, y, button, modifiers, delay);
914
125
        if (pressTimeout !== undefined && pressTimeout > 0) {
915
126
            wait(pressTimeout);
916
127
        }
917
128
        for (var i = 1; i <= steps; i++) {
918
129
            // mouse moves are all processed immediately, without delay in between events
919
130
            mouseMove(item, x + i * ddx, y + i * ddy, -1, button);
920
131
        }
921
132
        mouseRelease(item, x + dx, y + dy, button, modifiers, delay);
922
133
        // empty event buffer
923
134
        wait(200);
924
135
    }
925
136
926
137
    /*!
927
138
        \qmlmethod UbuntuTestCase::mouseLongPress(item, x, y, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
928
139
929
140
        Simulates a long press on a mouse \a button with an optional \a modifier
930
141
        on an \a item. The position is defined by \a x and \a y. If \a delay is
931
142
        specified, the test will wait the specified amount of milliseconds before
932
143
        the press.
933
144
934
145
        The position given by \a x and \a y is transformed from the co-ordinate
935
146
        system of \a item into window co-ordinates and then delivered.
936
147
        If \a item is obscured by another item, or a child of \a item occupies
937
148
        that position, then the event will be delivered to the other item instead.
938
149
939
150
        \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseMove(), mouseDrag(), mouseWheel()
940
151
      */
941
152
    function mouseLongPress(item, x, y, button, modifiers, delay) {
942
153
        mousePress(item, x, y, button, modifiers, delay);
943
154
        // the delay is taken from QQuickMouseArea
944
155
        wait(800);
945
156
    }
946
157
947
158
    /*!
948
91
		Keeps executing a given parameter-less function until it returns the given
159
		Keeps executing a given parameter-less function until it returns the given
949
92
		expected result or the timemout is reached (in which case a test failure
160
		expected result or the timemout is reached (in which case a test failure
950
93
		is generated)
161
		is generated)
951
94
162
952
=== modified file 'modules/Ubuntu/Test/deployment.pri'
953
--- modules/Ubuntu/Test/deployment.pri	2014-01-17 12:30:05 +0000
954
+++ modules/Ubuntu/Test/deployment.pri	2014-04-10 09:56:33 +0000
955
@@ -7,9 +7,14 @@
956
7
# make found deployables visible in Qt Creator
7
# make found deployables visible in Qt Creator
957
8
OTHER_FILES += $$QMLDIR_FILE
8
OTHER_FILES += $$QMLDIR_FILE
958
9
9
959
10
QML_FILES = $$system(ls *.qml)
960
11
JS_FILES = $$system(ls *.js)
961
12
962
10
# define deployment for found deployables
13
# define deployment for found deployables
963
11
qmldir_file.path = $$installPath
14
qmldir_file.path = $$installPath
964
12
qmldir_file.files = $$QMLDIR_FILE
15
qmldir_file.files = $$QMLDIR_FILE
965
16
qml_files.path = $$installPath
966
17
qml_files.files = $$QML_FILES
967
13
js_files.path = $$installPath
18
js_files.path = $$installPath
968
14
js_files.files = $$JS_FILES
19
js_files.files = $$JS_FILES
969
15
20
970
@@ -20,4 +25,4 @@
971
20
# https://bugreports.qt-project.org/browse/QTBUG-36243
25
# https://bugreports.qt-project.org/browse/QTBUG-36243
972
21
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
26
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
973
22
27
975
23
INSTALLS += qmldir_file plugins_qmltypes
28
INSTALLS += qmldir_file plugins_qmltypes qml_files js_files
976
24
29
977
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
978
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-08 14:46:25 +0000
979
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-10 09:56:33 +0000
980
@@ -470,6 +470,32 @@
981
470
        self.checked.wait_for(not original_state, timeout)
470
        self.checked.wait_for(not original_state, timeout)
982
471
471
983
472
472
984
473
class ComboButton(UbuntuUIToolkitEmulatorBase):
985
474
    """ComboButton Autopilot emulator."""
986
475
987
476
    def press_mainbutton(self):
988
477
        """Presses the main button of the ComboBox."""
989
478
        main_button = self.select_single(objectName="combobutton_mainbutton")
990
479
        self.pointing_device.click_object(main_button)
991
480
992
481
    def press_dropdown(self):
993
482
        """Presses the dropdown button to togle combo list expansion."""
994
483
        dropdown_button = self.select_single(objectName="combobutton_dropdown")
995
484
        self.pointing_device.click_object(dropdown_button)
996
485
997
486
    def expand(self):
998
487
        """Expands a combo button by clicking on the dropdown button."""
999
488
        if self.expanded:
1000
489
            return
1001
490
        self.press_dropdown()
1002
491
1003
492
    def collapse(self):
1004
493
        """Collapses a combo button by clicking on the dropdown button."""
1005
494
        if not self.expanded:
1006
495
            return
1007
496
        self.press_dropdown()
1008
497
1009
498
1010
473
class TextField(UbuntuUIToolkitEmulatorBase):
499
class TextField(UbuntuUIToolkitEmulatorBase):
1011
474
    """TextField Autopilot emulator."""
500
    """TextField Autopilot emulator."""
1012
475
501
1013
476
502
1014
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
1015
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-22 06:53:24 +0000
1016
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-10 09:56:33 +0000
1017
@@ -1079,3 +1079,48 @@
1018
1079
        self.composer_sheet.cancel()
1079
        self.composer_sheet.cancel()
1019
1080
        self.assertEqual(self.label.text, 'Cancel selected.')
1080
        self.assertEqual(self.label.text, 'Cancel selected.')
1020
1081
        self._assert_composer_sheet_is_closed()
1081
        self._assert_composer_sheet_is_closed()
1021
1082
1022
1083
1023
1084
class ComboButtonTestCase(tests.QMLStringAppTestCase):
1024
1085
1025
1086
    test_qml = ("""
1026
1087
import QtQuick 2.0
1027
1088
import Ubuntu.Components 0.1
1028
1089
import Ubuntu.Components.ListItems 0.1
1029
1090
1030
1091
MainView {
1031
1092
    width: units.gu(40)
1032
1093
    height: units.gu(60)
1033
1094
1034
1095
    Item {
1035
1096
        ComboButton {
1036
1097
            text: "main button"
1037
1098
            objectName: "combo_button"
1038
1099
            ListView {
1039
1100
                model: 10
1040
1101
                delegate: Standard {
1041
1102
                    text: "Item #" + modelData
1042
1103
                }
1043
1104
            }
1044
1105
        }
1045
1106
    }
1046
1107
}
1047
1108
""")
1048
1109
1049
1110
    def setUp(self):
1050
1111
        super(ComboButtonTestCase, self).setUp()
1051
1112
        self.combo = self.main_view.select_single(
1052
1113
            emulators.ComboButton, objectName="combo_button")
1053
1114
        self.assertFalse(self.combo.expanded)
1054
1115
1055
1116
    def test_expand_collapse_combo(self):
1056
1117
        self.combo.expand()
1057
1118
        self.assertTrue(self.combo.expanded)
1058
1119
        self.combo.collapse()
1059
1120
        self.assertFalse(self.combo.expanded)
1060
1121
1061
1122
    def test_autocollapse(self):
1062
1123
        self.combo.expand()
1063
1124
        self.assertTrue(self.combo.expanded)
1064
1125
        self.combo.press_mainbutton()
1065
1126
        self.assertFalse(self.combo.expanded)
1066
1082
1127
1067
=== added directory 'tests/resources/buttons'
1068
=== added file 'tests/resources/buttons/ComboTest.qml'
1069
--- tests/resources/buttons/ComboTest.qml	1970-01-01 00:00:00 +0000
1070
+++ tests/resources/buttons/ComboTest.qml	2014-04-10 09:56:33 +0000
1071
@@ -0,0 +1,147 @@
1072
1
/*
1073
2
 * Copyright 2014 Canonical Ltd.
1074
3
 *
1075
4
 * This program is free software; you can redistribute it and/or modify
1076
5
 * it under the terms of the GNU Lesser General Public License as published by
1077
6
 * the Free Software Foundation; version 3.
1078
7
 *
1079
8
 * This program is distributed in the hope that it will be useful,
1080
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1081
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1082
11
 * GNU Lesser General Public License for more details.
1083
12
 *
1084
13
 * You should have received a copy of the GNU Lesser General Public License
1085
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1086
15
 *
1087
16
 * Author: Zsombor Egri <zsombor.egri@canonical.com>
1088
17
 */
1089
18
import QtQuick 2.0
1090
19
import Ubuntu.Components 0.1
1091
20
import Ubuntu.Components.ListItems 0.1
1092
21
1093
22
MainView {
1094
23
    width: units.gu(40)
1095
24
    height: units.gu(71)
1096
25
1097
26
1098
27
    Column {
1099
28
        anchors.fill: parent
1100
29
        spacing: units.gu(2)
1101
30
1102
31
        ComboButton {
1103
32
            id: combo1
1104
33
            text: "collapsedHeight differs"
1105
34
            collapsedHeight: units.gu(6)
1106
35
            Rectangle {
1107
36
                color: "green"
1108
37
//                height: combo1.comboListHeight
1109
38
            }
1110
39
        }
1111
40
1112
41
        ComboButton {
1113
42
            text: "content is Rectangle > expanded"
1114
43
            Rectangle {
1115
44
                height: units.gu(40)
1116
45
                gradient: Gradient {
1117
46
                    GradientStop {
1118
47
                        position: 0.0
1119
48
                        color: "red"
1120
49
                    }
1121
50
                    GradientStop {
1122
51
                        position: 0.5
1123
52
                        color: "green"
1124
53
                    }
1125
54
                    GradientStop {
1126
55
                        position: 1.0
1127
56
                        color: "blue"
1128
57
                    }
1129
58
                }
1130
59
            }
1131
60
        }
1132
61
1133
62
        ComboButton {
1134
63
            text: "comboList is Flickable"
1135
64
            Flickable {
1136
65
                id: flickable
1137
66
                objectName: "Flickable"
1138
67
                anchors {
1139
68
                    left: parent.left
1140
69
                    right: parent.right
1141
70
                    top: parent.top
1142
71
                }
1143
72
                contentHeight: rect.height
1144
73
1145
74
                Rectangle {
1146
75
                    id: rect
1147
76
                    width: parent.width
1148
77
                    height: units.gu(40)
1149
78
                    gradient: Gradient {
1150
79
                        GradientStop {
1151
80
                            position: 0.0
1152
81
                            color: "red"
1153
82
                        }
1154
83
                        GradientStop {
1155
84
                            position: 0.5
1156
85
                            color: "green"
1157
86
                        }
1158
87
                        GradientStop {
1159
88
                            position: 1.0
1160
89
                            color: "blue"
1161
90
                        }
1162
91
                    }
1163
92
                }
1164
93
            }
1165
94
        }
1166
95
1167
96
        ComboButton {
1168
97
            id: combo2
1169
98
            text: "comboList is ListView"
1170
99
            expanded: true
1171
100
            expandedHeight: units.gu(30)
1172
101
            UbuntuListView {
1173
102
                objectName: "ListView"
1174
103
                model: 20
1175
104
                delegate: Standard {
1176
105
                    text: "Action #" + modelData
1177
106
                    onClicked: {
1178
107
                        combo2.text = text;
1179
108
                        combo2.expanded = false
1180
109
                    }
1181
110
                }
1182
111
            }
1183
112
        }
1184
113
1185
114
        ComboButton {
1186
115
            id: combo3
1187
116
            text: "auto expandHeight"
1188
117
            expandedHeight: -1
1189
118
            Column {
1190
119
                id: column
1191
120
                anchors {
1192
121
                    left: parent.left
1193
122
                    right: parent.right
1194
123
                }
1195
124
                Rectangle {
1196
125
                    width: parent.width
1197
126
                    height: units.gu(6)
1198
127
                    color: "red"
1199
128
                }
1200
129
                Rectangle {
1201
130
                    width: parent.width
1202
131
                    height: units.gu(6)
1203
132
                    color: "green"
1204
133
                }
1205
134
                Rectangle {
1206
135
                    width: parent.width
1207
136
                    height: units.gu(6)
1208
137
                    color: "blue"
1209
138
                }
1210
139
                Rectangle {
1211
140
                    width: parent.width
1212
141
                    height: units.gu(6)
1213
142
                    color: "yellow"
1214
143
                }
1215
144
            }
1216
145
        }
1217
146
    }
1218
147
}
1219
0
148
1220
=== modified file 'tests/unit/runtest.sh'
1221
--- tests/unit/runtest.sh	2014-03-31 18:26:46 +0000
1222
+++ tests/unit/runtest.sh	2014-04-10 09:56:33 +0000
1223
@@ -33,7 +33,7 @@
1224
33
  if [ $_TARGET != $_TESTFILE ]; then
33
  if [ $_TARGET != $_TESTFILE ]; then
1225
34
      _CMD="$_CMD -input $_TESTFILE"
34
      _CMD="$_CMD -input $_TESTFILE"
1226
35
  fi
35
  fi
1228
36
  _CMD="$_CMD -maxwarnings 4"
36
  _CMD="$_CMD -maxwarnings 40"
1229
37
}
37
}
1230
38
38
1231
39
function execute_test_cmd {
39
function execute_test_cmd {
1232
40
40
1233
=== modified file 'tests/unit/tst_components/tst_button.qml'
1234
--- tests/unit/tst_components/tst_button.qml	2013-05-28 12:37:56 +0000
1235
+++ tests/unit/tst_components/tst_button.qml	2014-04-10 09:56:33 +0000
1236
@@ -53,6 +53,10 @@
1237
53
        compare(button.color,newColor,"Can set/get color")
53
        compare(button.color,newColor,"Can set/get color")
1238
54
    }
54
    }
1239
55
55
1240
56
    function test_font() {
1241
57
        verify(button.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs");
1242
58
    }
1243
59
1244
56
    function test_hovered() {
60
    function test_hovered() {
1245
57
        compare(button.hovered,false,"Hovered is boolean and false by default")
61
        compare(button.hovered,false,"Hovered is boolean and false by default")
1246
58
    }
62
    }
1247
59
63
1248
=== added file 'tests/unit_x11/tst_components/tst_combobutton.qml'
1249
--- tests/unit_x11/tst_components/tst_combobutton.qml	1970-01-01 00:00:00 +0000
1250
+++ tests/unit_x11/tst_components/tst_combobutton.qml	2014-04-10 09:56:33 +0000
1251
@@ -0,0 +1,246 @@
1252
1
/*
1253
2
 * Copyright 2014 Canonical Ltd.
1254
3
 *
1255
4
 * This program is free software; you can redistribute it and/or modify
1256
5
 * it under the terms of the GNU Lesser General Public License as published by
1257
6
 * the Free Software Foundation; version 3.
1258
7
 *
1259
8
 * This program is distributed in the hope that it will be useful,
1260
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1261
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1262
11
 * GNU Lesser General Public License for more details.
1263
12
 *
1264
13
 * You should have received a copy of the GNU Lesser General Public License
1265
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1266
15
 */
1267
16
1268
17
import QtQuick 2.0
1269
18
import QtTest 1.0
1270
19
import Ubuntu.Test 0.1
1271
20
import Ubuntu.Components 0.1
1272
21
import Ubuntu.Components.ListItems 0.1
1273
22
1274
23
Item {
1275
24
    width: units.gu(40)
1276
25
    height: units.gu(71)
1277
26
1278
27
    Column {
1279
28
        ComboButton {
1280
29
            id: combo
1281
30
        }
1282
31
1283
32
        ComboButton {
1284
33
            id: rectCombo
1285
34
1286
35
            Rectangle {
1287
36
                id: rect
1288
37
                width: parent.width
1289
38
                height: units.gu(40)
1290
39
                gradient: Gradient {
1291
40
                    GradientStop {
1292
41
                        position: 0.0
1293
42
                        color: "red"
1294
43
                    }
1295
44
                    GradientStop {
1296
45
                        position: 0.5
1297
46
                        color: "green"
1298
47
                    }
1299
48
                    GradientStop {
1300
49
                        position: 1.0
1301
50
                        color: "blue"
1302
51
                    }
1303
52
                }
1304
53
            }
1305
54
        }
1306
55
1307
56
        ComboButton {
1308
57
            id: columnCombo
1309
58
            expandedHeight: -1
1310
59
            Column {
1311
60
                id: column
1312
61
                anchors {
1313
62
                    left: parent.left
1314
63
                    right: parent.right
1315
64
                }
1316
65
                height: childrenRect.height
1317
66
                Repeater {
1318
67
                    model: 5
1319
68
                    Rectangle {
1320
69
                        width: parent.width
1321
70
                        height: units.gu(5)
1322
71
                        color: Qt.rgba(Math.random(1), Math.random(1), Math.random(1), 1);
1323
72
                    }
1324
73
                }
1325
74
            }
1326
75
        }
1327
76
1328
77
        ComboButton {
1329
78
            id: longCombo
1330
79
            expandedHeight: units.gu(40)
1331
80
            Rectangle {
1332
81
                id: longRect
1333
82
                height: units.gu(10)
1334
83
                color: "cyan"
1335
84
            }
1336
85
        }
1337
86
1338
87
        ComboButton {
1339
88
            id: listCombo
1340
89
            ListView {
1341
90
                id: list
1342
91
                model: 20
1343
92
                height: listCombo.comboListHeight
1344
93
                delegate: Standard {
1345
94
                    text: modelData
1346
95
                }
1347
96
            }
1348
97
        }
1349
98
    }
1350
99
1351
100
    SignalSpy { id: spy }
1352
101
1353
102
    UbuntuTestCase {
1354
103
        name: "ComboButton"
1355
104
        when: windowShown
1356
105
1357
106
        function cleanup() {
1358
107
            rectCombo.expanded =
1359
108
            columnCombo.expanded =
1360
109
            longCombo.expanded =
1361
110
            listCombo.expanded = false;
1362
111
            spy.clear();
1363
112
            spy.signalName = "";
1364
113
            spy.target = undefined;
1365
114
        }
1366
115
1367
116
        function test_0_defaults() {
1368
117
            compare(combo.expanded, false, "not expanded by default");
1369
118
            compare(combo.autoCollapse, true, "automatically collapses");
1370
119
            compare(combo.collapsedHeight, combo.implicitHeight, "collapsedHeight is implicitHeight");
1371
120
            compare(combo.expandedHeight, combo.collapsedHeight + units.gu(19.5), "expanded height default");
1372
121
            var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin;
1373
122
            compare(combo.comboListHeight, lheight, "comboListHeight default");
1374
123
            compare(combo.comboList.length, 0, "comboList is empty");
1375
124
            verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs.");
1376
125
            verify(combo.dropdownColorPressed === combo.__styleInstance.defaultDropdownColorPressed, "Default dropdown pressed color differs");
1377
126
            verify(combo.dropdownColorReleased === combo.__styleInstance.defaultDropdownColorReleased, "Default dropdown released color differs");
1378
127
        }
1379
128
1380
129
        function test_dropdownColor() {
1381
130
            rectCombo.dropdownColorPressed = "red";
1382
131
            rectCombo.dropdownColorReleased = "green";
1383
132
            rectCombo.expanded = false;
1384
133
            var dropdownFace = findChild(rectCombo, "combobutton_dropdown_visuals");
1385
134
            verify(dropdownFace, "Dropdown button visuals cannot be reached");
1386
135
            verify(dropdownFace.color === rectCombo.dropdownColorReleased, "Dropdon color when collapsed wrong");
1387
136
            rectCombo.expanded = true;
1388
137
            waitForRendering(rectCombo);
1389
138
            verify(dropdownFace.color === rectCombo.dropdownColorPressed, "Dropdon color when expanded wrong");
1390
139
        }
1391
140
1392
141
        function test_comboListWidth() {
1393
142
            var comboListHolder = findChild(rectCombo, "combobutton_combolist");
1394
143
            compare(rect.width, comboListHolder.width, "rectCombo list content width is not adjusted");
1395
144
            comboListHolder = findChild(columnCombo, "combobutton_combolist");
1396
145
            compare(column.width, comboListHolder.width, "columnCombo list content width is not adjusted");
1397
146
            comboListHolder = findChild(longCombo, "combobutton_combolist");
1398
147
            compare(longRect.width, comboListHolder.width, "longCombo list content width is not adjusted");
1399
148
            comboListHolder = findChild(listCombo, "combobutton_combolist");
1400
149
            compare(list.width, comboListHolder.width, "listCombo list content width is not adjusted");
1401
150
        }
1402
151
1403
152
        function test_expandRectComboThroughProperty() {
1404
153
            rectCombo.expanded = true;
1405
154
            waitForRendering(rectCombo);
1406
155
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
1407
156
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1408
157
        }
1409
158
1410
159
        function test_expandRectComboThroughClick() {
1411
160
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
1412
161
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
1413
162
            waitForRendering(rectCombo);
1414
163
            compare(rectCombo.expanded, true, "combo is not expanded");
1415
164
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
1416
165
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1417
166
        }
1418
167
1419
168
        function test_autoCollapse() {
1420
169
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
1421
170
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
1422
171
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
1423
172
            waitForRendering(rectCombo);
1424
173
            compare(rectCombo.expanded, true, "combo is not expanded");
1425
174
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1426
175
1427
176
            mouseClick(rectCombo, rectCombo.width / 2, rectCombo.collapsedHeight / 2);
1428
177
            waitForRendering(rectCombo);
1429
178
            compare(rectCombo.expanded, false, "combo is not collapsed");
1430
179
            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0);
1431
180
        }
1432
181
1433
182
        function test_flickRectCombo() {
1434
183
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
1435
184
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
1436
185
            var comboList = findChild(rectCombo, "combobutton_combolist");
1437
186
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
1438
187
            waitForRendering(rectCombo);
1439
188
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1440
189
            verify(comboList.height > rectCombo.expandedHeight);
1441
190
            // comboList flicker is the combolist parent's parent
1442
191
            var comboListFlicker = comboList.parent.parent;
1443
192
            compare(comboListFlicker.interactive, true, "combo list holder must be interactive");
1444
193
1445
194
            // drag the rectangle, the Flickable should be moving
1446
195
            var x = comboListFlicker.width / 2;
1447
196
            var y = comboListFlicker.height / 2;
1448
197
            var dy = comboListFlicker.height / 6;
1449
198
            spy.target = comboListFlicker;
1450
199
            spy.signalName = "onMovementEnded";
1451
200
            mouseDrag(comboListFlicker, x, y, x, dy);
1452
201
            waitForRendering(comboListFlicker);
1453
202
            compare(spy.count, 1, "combo list content did not move");
1454
203
        }
1455
204
1456
205
        function test_autoExpandHeight() {
1457
206
            var comboListPanel = findChild(columnCombo, "combobutton_combopanel");
1458
207
            var comboList = findChild(columnCombo, "combobutton_combolist");
1459
208
            columnCombo.expanded = true;
1460
209
            waitForRendering(columnCombo);
1461
210
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1462
211
            var comboListFlicker = comboList.parent.parent;
1463
212
            compare(comboListFlicker.interactive, false, "combo list holder must not be interactive");
1464
213
            compare(comboListFlicker.height, columnCombo.comboListHeight, "combo list height differs from the holder height");
1465
214
        }
1466
215
1467
216
        function test_emptyComboExpanded() {
1468
217
            var comboListPanel = findChild(combo, "combobutton_combopanel");
1469
218
            var comboList = findChild(combo, "combobutton_combolist");
1470
219
            combo.expanded = true;
1471
220
            waitForRendering(combo);
1472
221
            waitForRendering(comboListPanel);
1473
222
            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0, 1000);
1474
223
        }
1475
224
1476
225
        function test_longCombo() {
1477
226
            var comboListPanel = findChild(longCombo, "combobutton_combopanel");
1478
227
            var comboList = findChild(longCombo, "combobutton_combolist");
1479
228
            longCombo.expanded = true;
1480
229
            waitForRendering(longCombo);
1481
230
            waitForRendering(comboListPanel);
1482
231
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1483
232
            verify(comboListPanel.height < longCombo.expandedHeight);
1484
233
        }
1485
234
1486
235
        function test_listCombo() {
1487
236
            var comboListPanel = findChild(listCombo, "combobutton_combopanel");
1488
237
            var comboList = findChild(listCombo, "combobutton_combolist");
1489
238
            listCombo.expanded = true;
1490
239
            waitForRendering(listCombo);
1491
240
            waitForRendering(comboListPanel);
1492
241
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
1493
242
1494
243
            compare(list.height, comboList.height, "list and comboList height differs");
1495
244
        }
1496
245
    }
1497
246
}
1498
0
247
1499
=== modified file 'tests/unit_x11/tst_components/tst_components.pro'
1500
--- tests/unit_x11/tst_components/tst_components.pro	2013-11-26 12:44:39 +0000
1501
+++ tests/unit_x11/tst_components/tst_components.pro	2014-04-10 09:56:33 +0000
1502
@@ -7,4 +7,5 @@
1503
7
SOURCES += tst_components.cpp tabsmodel.cpp
7
SOURCES += tst_components.cpp tabsmodel.cpp
1504
8
HEADERS += tabsmodel.h
8
HEADERS += tabsmodel.h
1505
9
9
1507
10
OTHER_FILES += $$system(ls *.qml)
10
OTHER_FILES += $$system(ls *.qml) \
1508
11
    tst_combobutton.qml
1509
11
12
1510
=== modified file 'tests/unit_x11/tst_test/tst_ubuntutestcase.qml'
1511
--- tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-02-13 10:27:14 +0000
1512
+++ tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-04-10 09:56:33 +0000
1513
@@ -23,30 +23,57 @@
1514
23
 width: 800
23
 width: 800
1515
24
 height: 600
24
 height: 600
1516
25
25
1525
26
 MouseArea {
26
 Column {
1526
27
    id: mouseArea
27
     anchors.fill: parent
1527
28
    objectName: "myMouseArea"
28
     MouseArea {
1528
29
 	anchors.fill: parent
29
        id: mouseArea
1529
30
 	hoverEnabled: true
30
        objectName: "myMouseArea"
1530
31
	property int testX : 0
31
        width: parent.width
1531
32
	property int testY : 0
32
        height: 300
1532
33
	property int steps : 0
33
        hoverEnabled: true
1533
34
        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
1534
35
        property int testX : 0
1535
36
        property int testY : 0
1536
37
        property int steps : 0
1537
34
38
1543
35
 	onPositionChanged: {
39
        onPositionChanged: {
1544
36
 	   testX = mouseX;
40
           testX = mouseX;
1545
37
	   testY = mouseY;
41
           testY = mouseY;
1546
38
	   steps++;
42
           steps++;
1547
39
 	}
43
        }
1548
44
     }
1549
45
     Flickable {
1550
46
         id: flicker
1551
47
         width: parent.width
1552
48
         height: 400
1553
49
         contentWidth: rect.width
1554
50
         contentHeight: rect.height
1555
51
         clip: true
1556
52
         Rectangle {
1557
53
             id: rect
1558
54
             color: "blue"
1559
55
             width: 1000
1560
56
             height: 1000
1561
57
         }
1562
58
     }
1563
40
 }
59
 }
1564
41
 
60
 
1565
42
 UbuntuTestCase {
61
 UbuntuTestCase {
1566
43
    name: "TestTheUbuntuTestCase"
62
    name: "TestTheUbuntuTestCase"
1567
44
    when: windowShown
63
    when: windowShown
1568
45
64
1569
65
    function init() {
1570
66
        mouseArea.steps = 0;
1571
67
    }
1572
68
    function cleanup() {
1573
69
        movementSpy.clear();
1574
70
        longPressSpy.clear();
1575
71
    }
1576
72
1577
46
    function test_mouseMoveSlowly() {
73
    function test_mouseMoveSlowly() {
1579
47
       mouseMoveSlowly(root,0,0,800,600,10,100);
74
       mouseMoveSlowly(root,0,0,800,300,10,100);
1580
48
       compare(mouseArea.testX,800);
75
       compare(mouseArea.testX,800);
1582
49
       compare(mouseArea.testY,600);
76
       compare(mouseArea.testY,300);
1583
50
       compare(mouseArea.steps,10);
77
       compare(mouseArea.steps,10);
1584
51
    }
78
    }
1585
52
79
1586
@@ -58,5 +85,66 @@
1587
58
        child = findChild(root,"NoSuchChildHere");
85
        child = findChild(root,"NoSuchChildHere");
1588
59
        compare(child===null,true,"When there is no child, function should return null");
86
        compare(child===null,true,"When there is no child, function should return null");
1589
60
    }
87
    }
1590
88
1591
89
    SignalSpy {
1592
90
        id: longPressSpy
1593
91
        target: mouseArea
1594
92
        signalName: "onPressAndHold"
1595
93
    }
1596
94
1597
95
    function test_longPress_left() {
1598
96
        longPressSpy.clear();
1599
97
        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2);
1600
98
        longPressSpy.wait();
1601
99
        // cleanup
1602
100
        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2);
1603
101
    }
1604
102
1605
103
    function test_longPress_right() {
1606
104
        longPressSpy.clear();
1607
105
        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.RightButton);
1608
106
        longPressSpy.wait();
1609
107
        // cleanup
1610
108
        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.RightButton);
1611
109
    }
1612
110
1613
111
    function test_longPress_middle() {
1614
112
        longPressSpy.clear();
1615
113
        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.MiddleButton);
1616
114
        longPressSpy.wait();
1617
115
        // cleanup
1618
116
        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.MiddleButton);
1619
117
    }
1620
118
1621
119
    SignalSpy {
1622
120
        id: movementSpy
1623
121
        target: flicker
1624
122
        signalName: "onMovementEnded"
1625
123
    }
1626
124
1627
125
    function test_flick_default() {
1628
126
        flick(flicker, 0, 0, flicker.width, flicker.height);
1629
127
        movementSpy.wait();
1630
128
    }
1631
129
    function test_flick_long() {
1632
130
        flick(flicker, 0, 0, flicker.width, flicker.height, -1, 10);
1633
131
        movementSpy.wait();
1634
132
    }
1635
133
    function test_flick_short() {
1636
134
        flick(flicker, 0, 0, flicker.width, flicker.height, -1, 1);
1637
135
        movementSpy.wait();
1638
136
    }
1639
137
    function test_flick_pressTimeout() {
1640
138
        flick(flicker, 0, 0, flicker.width, flicker.height, 400);
1641
139
        movementSpy.wait();
1642
140
    }
1643
141
    function test_flick_pressTimeout_short() {
1644
142
        flick(flicker, flicker.width, flicker.height, -flicker.width, -flicker.height, 400, 1);
1645
143
        movementSpy.wait();
1646
144
    }
1647
145
    function test_flick_pressTimeout_long() {
1648
146
        flick(flicker, flicker.width, flicker.height, -flicker.width, -flicker.height, 400, 100);
1649
147
        movementSpy.wait();
1650
148
    }
1651
61
 }
149
 }
1652
62
}
150
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-04-09
Tim Peeters		2014-02-21	Needs Fixing on 2014-04-02
Nekhelesh Ramananthan (community)			Needs Information on 2014-03-15
Review via email: mp+207598@code.launchpad.net