1
=== modified file 'components.api'
2
--- components.api	2017-01-26 11:59:45 +0000
3
+++ components.api	2017-02-21 14:57:14 +0000
4
@@ -731,6 +731,7 @@
5
731
Ubuntu.Components.OptionSelector 1.3: Empty
731
Ubuntu.Components.OptionSelector 1.3: Empty
6
732
    property bool colourImage
732
    property bool colourImage
7
733
    property double containerHeight
733
    property double containerHeight
8
734
    readonly property int count
9
734
    property bool currentlyExpanded
735
    property bool currentlyExpanded
10
735
    property Component delegate
736
    property Component delegate
11
736
    property bool expanded
737
    property bool expanded
12
737
738
13
=== modified file 'src/imports/Components/1.3/OptionSelector.qml'
14
--- src/imports/Components/1.3/OptionSelector.qml	2016-08-22 10:18:57 +0000
15
+++ src/imports/Components/1.3/OptionSelector.qml	2017-02-21 14:57:14 +0000
16
@@ -155,6 +155,12 @@
17
155
    }
155
    }
18
156
156
19
157
    /*!
157
    /*!
20
158
      \qmlproperty int count
21
159
      This property holds the number of items in the OptionSelector.
22
160
     */
23
161
    property alias count: list.count
24
162
25
163
    /*!
26
158
      \qmlproperty int selectedIndex
164
      \qmlproperty int selectedIndex
27
159
      The index of the currently selected element in our list.
165
      The index of the currently selected element in our list.
28
160
     */
166
     */
29
161
167
30
=== modified file 'tests/unit/visual/tst_optionselector.13.qml'
31
--- tests/unit/visual/tst_optionselector.13.qml	2016-09-19 11:13:19 +0000
32
+++ tests/unit/visual/tst_optionselector.13.qml	2017-02-21 14:57:14 +0000
33
@@ -183,8 +183,17 @@
34
183
        function test_custom_data() {
183
        function test_custom_data() {
35
184
            return test_arrow_select_data()
184
            return test_arrow_select_data()
36
185
        }
185
        }
37
186
38
186
        function test_custom(data) {
187
        function test_custom(data) {
39
187
            test_arrow_select(data, customSelector, 2);
188
            test_arrow_select(data, customSelector, 2);
40
188
        }
189
        }
41
190
42
191
        function test_count() {
43
192
            var selector = defaultSelector;
44
193
            sections.selectedIndex = 0;
45
194
            selector.forceActiveFocus();
46
195
            waitForRendering(selector);
47
196
            compare(selector.count, customModel.count);
48
197
        }
49
189
    }
198
    }
50
190
}
199
}
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2017-02-21
Cris Dywan		2017-02-17	Approve on 2017-02-21
Review via email: mp+317568@code.launchpad.net