Merge lp:~zsombi/ubuntu-ui-toolkit/focus-handling-on-touch into lp:ubuntu-ui-toolkit/staging
- focus-handling-on-touch
- Merge into staging
| Status: | Merged |
|---|---|
| Approved by: | Zsombor Egri |
| Approved revision: | 1225 |
| Merged at revision: | 1211 |
| Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/focus-handling-on-touch |
| Merge into: | lp:ubuntu-ui-toolkit/staging |
| Prerequisite: | lp:~zsombi/ubuntu-ui-toolkit/ucfocusscope |
| Diff against target: |
1373 lines (+712/-316) 23 files modified
modules/Ubuntu/Components/AbstractButton.qml (+4/-0) modules/Ubuntu/Components/OptionSelector.qml (+5/-0) modules/Ubuntu/Components/PageTreeNode.qml (+3/-0) modules/Ubuntu/Components/Pickers/DatePicker.qml (+1/-0) modules/Ubuntu/Components/Pickers/Dialer.qml (+1/-0) modules/Ubuntu/Components/Pickers/DialerHand.qml (+2/-0) modules/Ubuntu/Components/Pickers/Picker.qml (+8/-0) modules/Ubuntu/Components/Pickers/PickerPanel.qml (+5/-0) modules/Ubuntu/Components/Popups/Dialog.qml (+1/-0) modules/Ubuntu/Components/Popups/Popover.qml (+1/-0) modules/Ubuntu/Components/Popups/PopupBase.qml (+31/-1) modules/Ubuntu/Components/Popups/SheetBase.qml (+1/-0) modules/Ubuntu/Components/Slider.qml (+4/-0) modules/Ubuntu/Components/TabBar.qml (+1/-0) modules/Ubuntu/Components/TextCursor.qml (+5/-2) modules/Ubuntu/Components/TextField.qml (+3/-0) modules/Ubuntu/Components/UbuntuListView.qml (+18/-0) modules/Ubuntu/Components/plugin/ucstyleditembase.cpp (+1/-2) tests/unit_x11/tst_components/tst_datepicker.qml (+6/-2) tests/unit_x11/tst_components/tst_focus.qml (+240/-0) tests/unit_x11/tst_components/tst_tabs.qml (+96/-309) tests/unit_x11/tst_components/tst_tabs_empty.qml (+41/-0) tests/unit_x11/tst_components/tst_tabs_with_repeater.qml (+234/-0) |
| To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/focus-handling-on-touch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Cris Dywan | Approve | ||
|
Review via email:
|
|||
Commit message
Focus handling on components.
Description of the change
| PS Jenkins bot (ps-jenkins) wrote : | # |
| Cris Dywan (kalikiana) wrote : | # |
393 + // note: find Label, Picker's label uses medium font size. The lookup must be changed
Rogue fix sneaked in. Please make a separate MR for this.
| Zsombor Egri (zsombi) wrote : | # |
> 393 + // note: find Label, Picker's label uses medium font size. The
> lookup must be changed
>
> Rogue fix sneaked in. Please make a separate MR for this.
As discussed, the order of children differs when focused. That's why it has been "sniffed" in here.
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1215
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1216
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1217
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
| Tim Peeters (tpeeters) wrote : | # |
tim@trusty:
unity::
Could not determine application identifier. HUD will not work properly.
Provide your application identifier in $APP_ID environment variable.
file://
Test '"/home/
file://
********* Start testing of qmltestrunner *********
Config: Using QtTest library 5.3.0, Qt 5.3.0
PASS : qmltestrunner:
PASS : qmltestrunner:
PASS : qmltestrunner:
Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of qmltestrunner *********
tim@trusty:
| Tim Peeters (tpeeters) wrote : | # |
^is just a typo in the code:
height: uniys.gu(100)
| Tim Peeters (tpeeters) wrote : | # |
this program http://
file://
it did not do that before. Please add a guard to check that window is valid.
| Tim Peeters (tpeeters) wrote : | # |
function saveActiveFocus() {
if (typeof window != 'undefined') prevFocus = window.
}
fixes the issue in the previous comment
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1219
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1221
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
| Cris Dywan (kalikiana) wrote : | # |
214 + if (typeof window != "undefined") {
This is still racy, it won't set if the window is available later. And it's the third instance where this came up and wasn't handled correctly on the first attempt.
We need something like Context.
| Zsombor Egri (zsombi) wrote : | # |
> 214 + if (typeof window != "undefined") {
>
> This is still racy, it won't set if the window is available later. And it's
> the third instance where this came up and wasn't handled correctly on the
> first attempt.
>
> We need something like Context.
I'll do a local fix with a property in between, and we can return to it in a separate MR with a proper fix.
| Cris Dywan (kalikiana) wrote : | # |
> > 214 + if (typeof window != "undefined") {
> >
> > This is still racy, it won't set if the window is available later. And it's
> > the third instance where this came up and wasn't handled correctly on the
> > first attempt.
> >
> > We need something like Context.
>
> I'll do a local fix with a property in between, and we can return to it in a
> separate MR with a proper fix.
Ack.
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1223
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
Unapproved changes made after approval.
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1225
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
| 1 | === modified file 'modules/Ubuntu/Components/AbstractButton.qml' | |||
| 2 | --- modules/Ubuntu/Components/AbstractButton.qml 2014-06-23 09:53:09 +0000 | |||
| 3 | +++ modules/Ubuntu/Components/AbstractButton.qml 2014-08-22 17:18:58 +0000 | |||
| 4 | @@ -16,6 +16,7 @@ | |||
| 5 | 16 | 16 | ||
| 6 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.0 |
| 7 | 18 | import QtFeedback 5.0 | 18 | import QtFeedback 5.0 |
| 8 | 19 | import Ubuntu.Components 1.1 | ||
| 9 | 19 | 20 | ||
| 10 | 20 | /*! | 21 | /*! |
| 11 | 21 | \qmlabstract AbstractButton | 22 | \qmlabstract AbstractButton |
| 12 | @@ -82,6 +83,8 @@ | |||
| 13 | 82 | */ | 83 | */ |
| 14 | 83 | property alias __mouseArea: mouseArea | 84 | property alias __mouseArea: mouseArea |
| 15 | 84 | 85 | ||
| 16 | 86 | activeFocusOnPress: true | ||
| 17 | 87 | |||
| 18 | 85 | HapticsEffect { | 88 | HapticsEffect { |
| 19 | 86 | id: pressEffect | 89 | id: pressEffect |
| 20 | 87 | attackIntensity: 0.0 | 90 | attackIntensity: 0.0 |
| 21 | @@ -100,6 +103,7 @@ | |||
| 22 | 100 | hoverEnabled: true | 103 | hoverEnabled: true |
| 23 | 101 | 104 | ||
| 24 | 102 | onClicked: { | 105 | onClicked: { |
| 25 | 106 | button.requestFocus(); | ||
| 26 | 103 | if (button.__acceptEvents) { | 107 | if (button.__acceptEvents) { |
| 27 | 104 | pressEffect.start() | 108 | pressEffect.start() |
| 28 | 105 | button.clicked() | 109 | button.clicked() |
| 29 | 106 | 110 | ||
| 30 | === modified file 'modules/Ubuntu/Components/OptionSelector.qml' | |||
| 31 | --- modules/Ubuntu/Components/OptionSelector.qml 2014-04-23 08:50:20 +0000 | |||
| 32 | +++ modules/Ubuntu/Components/OptionSelector.qml 2014-08-22 17:18:58 +0000 | |||
| 33 | @@ -220,6 +220,7 @@ | |||
| 34 | 220 | StyledItem { | 220 | StyledItem { |
| 35 | 221 | id: listContainer | 221 | id: listContainer |
| 36 | 222 | objectName: "listContainer" | 222 | objectName: "listContainer" |
| 37 | 223 | activeFocusOnPress: true | ||
| 38 | 223 | 224 | ||
| 39 | 224 | readonly property url chevron: __styleInstance.chevron | 225 | readonly property url chevron: __styleInstance.chevron |
| 40 | 225 | readonly property url tick: __styleInstance.tick | 226 | readonly property url tick: __styleInstance.tick |
| 41 | @@ -279,6 +280,10 @@ | |||
| 42 | 279 | property real itemHeight | 280 | property real itemHeight |
| 43 | 280 | signal delegateClicked(int index) | 281 | signal delegateClicked(int index) |
| 44 | 281 | 282 | ||
| 45 | 283 | onMovementStarted: optionSelector.requestFocus(Qt.MouseFocusReason) | ||
| 46 | 284 | onFlickStarted: optionSelector.requestFocus(Qt.MouseFocusReason) | ||
| 47 | 285 | Toolkit.Mouse.onClicked: optionSelector.requestFocus(Qt.MouseFocusReason) | ||
| 48 | 286 | |||
| 49 | 282 | onDelegateClicked: optionSelector.delegateClicked(index); | 287 | onDelegateClicked: optionSelector.delegateClicked(index); |
| 50 | 283 | interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false | 288 | interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false |
| 51 | 284 | clip: true | 289 | clip: true |
| 52 | 285 | 290 | ||
| 53 | === modified file 'modules/Ubuntu/Components/PageTreeNode.qml' | |||
| 54 | --- modules/Ubuntu/Components/PageTreeNode.qml 2014-06-19 12:45:37 +0000 | |||
| 55 | +++ modules/Ubuntu/Components/PageTreeNode.qml 2014-08-22 17:18:58 +0000 | |||
| 56 | @@ -100,6 +100,9 @@ | |||
| 57 | 100 | */ | 100 | */ |
| 58 | 101 | property bool isLeaf: false | 101 | property bool isLeaf: false |
| 59 | 102 | 102 | ||
| 60 | 103 | // turn on focusing | ||
| 61 | 104 | activeFocusOnPress: true | ||
| 62 | 105 | |||
| 63 | 103 | Binding { | 106 | Binding { |
| 64 | 104 | target: node.parentNode | 107 | target: node.parentNode |
| 65 | 105 | property: "activeLeafNode" | 108 | property: "activeLeafNode" |
| 66 | 106 | 109 | ||
| 67 | === modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml' | |||
| 68 | --- modules/Ubuntu/Components/Pickers/DatePicker.qml 2014-07-18 20:12:42 +0000 | |||
| 69 | +++ modules/Ubuntu/Components/Pickers/DatePicker.qml 2014-08-22 17:18:58 +0000 | |||
| 70 | @@ -302,6 +302,7 @@ | |||
| 71 | 302 | 302 | ||
| 72 | 303 | implicitWidth: units.gu(36) | 303 | implicitWidth: units.gu(36) |
| 73 | 304 | implicitHeight: units.gu(20) | 304 | implicitHeight: units.gu(20) |
| 74 | 305 | activeFocusOnPress: true | ||
| 75 | 305 | 306 | ||
| 76 | 306 | /*! \internal */ | 307 | /*! \internal */ |
| 77 | 307 | onMinimumChanged: { | 308 | onMinimumChanged: { |
| 78 | 308 | 309 | ||
| 79 | === modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml' | |||
| 80 | --- modules/Ubuntu/Components/Pickers/Dialer.qml 2014-04-25 12:53:58 +0000 | |||
| 81 | +++ modules/Ubuntu/Components/Pickers/Dialer.qml 2014-08-22 17:18:58 +0000 | |||
| 82 | @@ -142,6 +142,7 @@ | |||
| 83 | 142 | id: dialer | 142 | id: dialer |
| 84 | 143 | implicitWidth: size | 143 | implicitWidth: size |
| 85 | 144 | implicitHeight: size | 144 | implicitHeight: size |
| 86 | 145 | activeFocusOnPress: true | ||
| 87 | 145 | 146 | ||
| 88 | 146 | style: Theme.createStyleComponent("DialerStyle.qml", dialer) | 147 | style: Theme.createStyleComponent("DialerStyle.qml", dialer) |
| 89 | 147 | 148 | ||
| 90 | 148 | 149 | ||
| 91 | === modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml' | |||
| 92 | --- modules/Ubuntu/Components/Pickers/DialerHand.qml 2014-04-25 12:53:58 +0000 | |||
| 93 | +++ modules/Ubuntu/Components/Pickers/DialerHand.qml 2014-08-22 17:18:58 +0000 | |||
| 94 | @@ -141,6 +141,7 @@ | |||
| 95 | 141 | anchors.centerIn: parent | 141 | anchors.centerIn: parent |
| 96 | 142 | width: parent.width | 142 | width: parent.width |
| 97 | 143 | height: parent.height | 143 | height: parent.height |
| 98 | 144 | activeFocusOnPress: true | ||
| 99 | 144 | style: Theme.createStyleComponent("DialerHandStyle.qml", dialerHand) | 145 | style: Theme.createStyleComponent("DialerHandStyle.qml", dialerHand) |
| 100 | 145 | 146 | ||
| 101 | 146 | /*! \internal */ | 147 | /*! \internal */ |
| 102 | @@ -193,6 +194,7 @@ | |||
| 103 | 193 | onPositionChanged: { | 194 | onPositionChanged: { |
| 104 | 194 | if (internalChange) return; | 195 | if (internalChange) return; |
| 105 | 195 | internalChange = true; | 196 | internalChange = true; |
| 106 | 197 | dialerHand.requestFocus(Qt.MouseFocusReason); | ||
| 107 | 196 | var point = mapToItem (dialerHand, mouse.x, mouse.y); | 198 | var point = mapToItem (dialerHand, mouse.x, mouse.y); |
| 108 | 197 | var diffX = (point.x - centerX); | 199 | var diffX = (point.x - centerX); |
| 109 | 198 | var diffY = -1 * (point.y - centerY); | 200 | var diffY = -1 * (point.y - centerY); |
| 110 | 199 | 201 | ||
| 111 | === modified file 'modules/Ubuntu/Components/Pickers/Picker.qml' | |||
| 112 | --- modules/Ubuntu/Components/Pickers/Picker.qml 2014-04-23 08:50:20 +0000 | |||
| 113 | +++ modules/Ubuntu/Components/Pickers/Picker.qml 2014-08-22 17:18:58 +0000 | |||
| 114 | @@ -157,6 +157,7 @@ | |||
| 115 | 157 | 157 | ||
| 116 | 158 | implicitWidth: units.gu(8) | 158 | implicitWidth: units.gu(8) |
| 117 | 159 | implicitHeight: units.gu(20) | 159 | implicitHeight: units.gu(20) |
| 118 | 160 | activeFocusOnPress: true | ||
| 119 | 160 | 161 | ||
| 120 | 161 | style: Theme.createStyleComponent("PickerStyle.qml", picker) | 162 | style: Theme.createStyleComponent("PickerStyle.qml", picker) |
| 121 | 162 | 163 | ||
| 122 | @@ -251,6 +252,9 @@ | |||
| 123 | 251 | picker.selectedIndex = 0; | 252 | picker.selectedIndex = 0; |
| 124 | 252 | } | 253 | } |
| 125 | 253 | } | 254 | } |
| 126 | 255 | // focus handling | ||
| 127 | 256 | onMoveStarted: picker.requestFocus(Qt.MouseFocusReason) | ||
| 128 | 257 | onFlickStarted: picker.requestFocus(Qt.MouseFocusReason) | ||
| 129 | 254 | } | 258 | } |
| 130 | 255 | 259 | ||
| 131 | 256 | function moveToIndex(toIndex) { | 260 | function moveToIndex(toIndex) { |
| 132 | @@ -289,6 +293,8 @@ | |||
| 133 | 289 | } | 293 | } |
| 134 | 290 | width: parent ? parent.width : 0 | 294 | width: parent ? parent.width : 0 |
| 135 | 291 | clip: true | 295 | clip: true |
| 136 | 296 | focus: true | ||
| 137 | 297 | Mouse.onClicked: picker.requestFocus() | ||
| 138 | 292 | 298 | ||
| 139 | 293 | model: picker.model | 299 | model: picker.model |
| 140 | 294 | delegate: picker.delegate | 300 | delegate: picker.delegate |
| 141 | @@ -348,6 +354,8 @@ | |||
| 142 | 348 | } | 354 | } |
| 143 | 349 | width: parent ? parent.width : 0 | 355 | width: parent ? parent.width : 0 |
| 144 | 350 | clip: true | 356 | clip: true |
| 145 | 357 | focus: true | ||
| 146 | 358 | Mouse.onClicked: picker.requestFocus(Qt.MouseFocusReason) | ||
| 147 | 351 | 359 | ||
| 148 | 352 | model: picker.model | 360 | model: picker.model |
| 149 | 353 | delegate: picker.delegate | 361 | delegate: picker.delegate |
| 150 | 354 | 362 | ||
| 151 | === modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml' | |||
| 152 | --- modules/Ubuntu/Components/Pickers/PickerPanel.qml 2014-04-23 08:50:20 +0000 | |||
| 153 | +++ modules/Ubuntu/Components/Pickers/PickerPanel.qml 2014-08-22 17:18:58 +0000 | |||
| 154 | @@ -118,6 +118,11 @@ | |||
| 155 | 118 | "callerProperty": property | 118 | "callerProperty": property |
| 156 | 119 | } | 119 | } |
| 157 | 120 | 120 | ||
| 158 | 121 | // hide OSK if eventually open | ||
| 159 | 122 | if (Qt.inputMethod.visible) { | ||
| 160 | 123 | Qt.inputMethod.hide(); | ||
| 161 | 124 | } | ||
| 162 | 125 | |||
| 163 | 121 | if (!internal.isPhone) { | 126 | if (!internal.isPhone) { |
| 164 | 122 | // we have no input panel defined, or the therefore we show the picker in a Popover | 127 | // we have no input panel defined, or the therefore we show the picker in a Popover |
| 165 | 123 | return internal.openPopover(caller, params); | 128 | return internal.openPopover(caller, params); |
| 166 | 124 | 129 | ||
| 167 | === modified file 'modules/Ubuntu/Components/Popups/Dialog.qml' | |||
| 168 | --- modules/Ubuntu/Components/Popups/Dialog.qml 2014-07-25 12:55:27 +0000 | |||
| 169 | +++ modules/Ubuntu/Components/Popups/Dialog.qml 2014-08-22 17:18:58 +0000 | |||
| 170 | @@ -157,6 +157,7 @@ | |||
| 171 | 157 | 157 | ||
| 172 | 158 | StyledItem { | 158 | StyledItem { |
| 173 | 159 | id: foreground | 159 | id: foreground |
| 174 | 160 | activeFocusOnPress: true | ||
| 175 | 160 | width: Math.min(minimumWidth, dialog.width) | 161 | width: Math.min(minimumWidth, dialog.width) |
| 176 | 161 | anchors.centerIn: parent | 162 | anchors.centerIn: parent |
| 177 | 162 | 163 | ||
| 178 | 163 | 164 | ||
| 179 | === modified file 'modules/Ubuntu/Components/Popups/Popover.qml' | |||
| 180 | --- modules/Ubuntu/Components/Popups/Popover.qml 2014-07-16 06:31:50 +0000 | |||
| 181 | +++ modules/Ubuntu/Components/Popups/Popover.qml 2014-08-22 17:18:58 +0000 | |||
| 182 | @@ -204,6 +204,7 @@ | |||
| 183 | 204 | 204 | ||
| 184 | 205 | StyledItem { | 205 | StyledItem { |
| 185 | 206 | id: foreground | 206 | id: foreground |
| 186 | 207 | activeFocusOnPress: true | ||
| 187 | 207 | objectName: "popover_foreground" | 208 | objectName: "popover_foreground" |
| 188 | 208 | 209 | ||
| 189 | 209 | //styling properties | 210 | //styling properties |
| 190 | 210 | 211 | ||
| 191 | === modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml' | |||
| 192 | --- modules/Ubuntu/Components/Popups/PopupBase.qml 2014-07-10 11:50:13 +0000 | |||
| 193 | +++ modules/Ubuntu/Components/Popups/PopupBase.qml 2014-08-22 17:18:58 +0000 | |||
| 194 | @@ -163,12 +163,41 @@ | |||
| 195 | 163 | onVisibleChanged: stateWrapper.state = (visible) ? 'opened' : 'closed' | 163 | onVisibleChanged: stateWrapper.state = (visible) ? 'opened' : 'closed' |
| 196 | 164 | /*! \internal */ | 164 | /*! \internal */ |
| 197 | 165 | onParentChanged: stateWrapper.rootItem = QuickUtils.rootItem(popupBase) | 165 | onParentChanged: stateWrapper.rootItem = QuickUtils.rootItem(popupBase) |
| 199 | 166 | Component.onCompleted: stateWrapper.rootItem = QuickUtils.rootItem(popupBase); | 166 | Component.onCompleted: { |
| 200 | 167 | stateWrapper.saveActiveFocus(); | ||
| 201 | 168 | stateWrapper.rootItem = QuickUtils.rootItem(popupBase); | ||
| 202 | 169 | } | ||
| 203 | 167 | 170 | ||
| 204 | 168 | Item { | 171 | Item { |
| 205 | 169 | id: stateWrapper | 172 | id: stateWrapper |
| 206 | 170 | property Item rootItem: QuickUtils.rootItem(popupBase) | 173 | property Item rootItem: QuickUtils.rootItem(popupBase) |
| 207 | 171 | 174 | ||
| 208 | 175 | property bool windowIsValid: typeof window != "undefined" | ||
| 209 | 176 | property Item prevFocus | ||
| 210 | 177 | |||
| 211 | 178 | function saveActiveFocus() { | ||
| 212 | 179 | // 'window' context property is exposed to QML after component completion | ||
| 213 | 180 | // before rendering is complete, therefore a simple 'if (window)' check is | ||
| 214 | 181 | // not enough. | ||
| 215 | 182 | if (windowIsValid) { | ||
| 216 | 183 | prevFocus = window.activeFocusItem; | ||
| 217 | 184 | windowIsValidChanged.disconnect(saveActiveFocus); | ||
| 218 | 185 | } else { | ||
| 219 | 186 | // connect the function so we can save the original focus item | ||
| 220 | 187 | windowIsValidChanged.connect(saveActiveFocus); | ||
| 221 | 188 | } | ||
| 222 | 189 | } | ||
| 223 | 190 | |||
| 224 | 191 | function restoreActiveFocus() { | ||
| 225 | 192 | if (prevFocus) { | ||
| 226 | 193 | if (prevFocus.hasOwnProperty("requestFocus")) { | ||
| 227 | 194 | prevFocus.requestFocus(Qt.PopupFocusReason); | ||
| 228 | 195 | } else { | ||
| 229 | 196 | prevFocus.forceActiveFocus(Qt.PopupFocusReason); | ||
| 230 | 197 | } | ||
| 231 | 198 | } | ||
| 232 | 199 | } | ||
| 233 | 200 | |||
| 234 | 172 | states: [ | 201 | states: [ |
| 235 | 173 | State { | 202 | State { |
| 236 | 174 | name: 'closed' | 203 | name: 'closed' |
| 237 | @@ -211,6 +240,7 @@ | |||
| 238 | 211 | ScriptAction { | 240 | ScriptAction { |
| 239 | 212 | script: { | 241 | script: { |
| 240 | 213 | popupBase.visible = false; | 242 | popupBase.visible = false; |
| 241 | 243 | stateWrapper.restoreActiveFocus(); | ||
| 242 | 214 | } | 244 | } |
| 243 | 215 | } | 245 | } |
| 244 | 216 | } | 246 | } |
| 245 | 217 | 247 | ||
| 246 | === modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml' | |||
| 247 | --- modules/Ubuntu/Components/Popups/SheetBase.qml 2014-06-03 13:37:22 +0000 | |||
| 248 | +++ modules/Ubuntu/Components/Popups/SheetBase.qml 2014-08-22 17:18:58 +0000 | |||
| 249 | @@ -86,6 +86,7 @@ | |||
| 250 | 86 | 86 | ||
| 251 | 87 | StyledItem { | 87 | StyledItem { |
| 252 | 88 | id: foreground | 88 | id: foreground |
| 253 | 89 | activeFocusOnPress: true | ||
| 254 | 89 | 90 | ||
| 255 | 90 | property string title | 91 | property string title |
| 256 | 91 | property real contentsWidth: units.gu(64) | 92 | property real contentsWidth: units.gu(64) |
| 257 | 92 | 93 | ||
| 258 | === modified file 'modules/Ubuntu/Components/Slider.qml' | |||
| 259 | --- modules/Ubuntu/Components/Slider.qml 2014-08-19 05:21:56 +0000 | |||
| 260 | +++ modules/Ubuntu/Components/Slider.qml 2014-08-22 17:18:58 +0000 | |||
| 261 | @@ -119,6 +119,8 @@ | |||
| 262 | 119 | /*! \internal */ | 119 | /*! \internal */ |
| 263 | 120 | onValueChanged: mouseArea.liveValue = slider.value | 120 | onValueChanged: mouseArea.liveValue = slider.value |
| 264 | 121 | 121 | ||
| 265 | 122 | activeFocusOnPress: true | ||
| 266 | 123 | |||
| 267 | 122 | Binding { | 124 | Binding { |
| 268 | 123 | target: slider | 125 | target: slider |
| 269 | 124 | property: "value" | 126 | property: "value" |
| 270 | @@ -208,6 +210,8 @@ | |||
| 271 | 208 | var normalizedOffsetX = (mouseArea.mouseX - dragInitMouseX) / barMinusThumb; | 210 | var normalizedOffsetX = (mouseArea.mouseX - dragInitMouseX) / barMinusThumb; |
| 272 | 209 | liveValue = valueFromNormalizedValue(dragInitNormalizedValue + normalizedOffsetX); | 211 | liveValue = valueFromNormalizedValue(dragInitNormalizedValue + normalizedOffsetX); |
| 273 | 210 | } | 212 | } |
| 274 | 213 | onClicked: slider.requestFocus(Qt.MouseFocusReason) | ||
| 275 | 214 | onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason) | ||
| 276 | 211 | } | 215 | } |
| 277 | 212 | 216 | ||
| 278 | 213 | style: Theme.createStyleComponent("SliderStyle.qml", slider) | 217 | style: Theme.createStyleComponent("SliderStyle.qml", slider) |
| 279 | 214 | 218 | ||
| 280 | === modified file 'modules/Ubuntu/Components/TabBar.qml' | |||
| 281 | --- modules/Ubuntu/Components/TabBar.qml 2014-05-09 11:22:07 +0000 | |||
| 282 | +++ modules/Ubuntu/Components/TabBar.qml 2014-08-22 17:18:58 +0000 | |||
| 283 | @@ -95,6 +95,7 @@ | |||
| 284 | 95 | property bool animate: true | 95 | property bool animate: true |
| 285 | 96 | 96 | ||
| 286 | 97 | implicitHeight: units.gu(7.5) | 97 | implicitHeight: units.gu(7.5) |
| 287 | 98 | activeFocusOnPress: true | ||
| 288 | 98 | 99 | ||
| 289 | 99 | style: Theme.createStyleComponent("TabBarStyle.qml", tabBar) | 100 | style: Theme.createStyleComponent("TabBarStyle.qml", tabBar) |
| 290 | 100 | 101 | ||
| 291 | 101 | 102 | ||
| 292 | === modified file 'modules/Ubuntu/Components/TextCursor.qml' | |||
| 293 | --- modules/Ubuntu/Components/TextCursor.qml 2014-06-13 08:57:48 +0000 | |||
| 294 | +++ modules/Ubuntu/Components/TextCursor.qml 2014-08-22 17:18:58 +0000 | |||
| 295 | @@ -72,18 +72,21 @@ | |||
| 296 | 72 | } | 72 | } |
| 297 | 73 | // open context menu only for cursorPosition or selectionEnd | 73 | // open context menu only for cursorPosition or selectionEnd |
| 298 | 74 | if (positionProperty !== "selectionStart") { | 74 | if (positionProperty !== "selectionStart") { |
| 299 | 75 | var popup; | ||
| 300 | 75 | if (handler.main.popover === undefined) { | 76 | if (handler.main.popover === undefined) { |
| 301 | 76 | // open the default one | 77 | // open the default one |
| 303 | 77 | PopupUtils.open(Qt.resolvedUrl("TextInputPopover.qml"), cursorItem, | 78 | popup = PopupUtils.open(Qt.resolvedUrl("TextInputPopover.qml"), cursorItem, |
| 304 | 78 | { | 79 | { |
| 305 | 79 | "target": handler.main | 80 | "target": handler.main |
| 306 | 80 | }) | 81 | }) |
| 307 | 81 | } else { | 82 | } else { |
| 309 | 82 | PopupUtils.open(handler.main.popover, cursorItem, | 83 | popup = PopupUtils.open(handler.main.popover, cursorItem, |
| 310 | 83 | { | 84 | { |
| 311 | 84 | "target": handler.main | 85 | "target": handler.main |
| 312 | 85 | }) | 86 | }) |
| 313 | 86 | } | 87 | } |
| 314 | 88 | // do not grab focus! | ||
| 315 | 89 | popup.__foreground.activeFocusOnPress = false; | ||
| 316 | 87 | } | 90 | } |
| 317 | 88 | } | 91 | } |
| 318 | 89 | 92 | ||
| 319 | 90 | 93 | ||
| 320 | === modified file 'modules/Ubuntu/Components/TextField.qml' | |||
| 321 | --- modules/Ubuntu/Components/TextField.qml 2014-08-08 07:28:49 +0000 | |||
| 322 | +++ modules/Ubuntu/Components/TextField.qml 2014-08-22 17:18:58 +0000 | |||
| 323 | @@ -818,6 +818,7 @@ | |||
| 324 | 818 | // internals | 818 | // internals |
| 325 | 819 | 819 | ||
| 326 | 820 | opacity: enabled ? 1.0 : 0.3 | 820 | opacity: enabled ? 1.0 : 0.3 |
| 327 | 821 | activeFocusOnPress: true | ||
| 328 | 821 | 822 | ||
| 329 | 822 | /*! \internal */ | 823 | /*! \internal */ |
| 330 | 823 | onVisibleChanged: { | 824 | onVisibleChanged: { |
| 331 | @@ -904,6 +905,8 @@ | |||
| 332 | 904 | AbstractButton { | 905 | AbstractButton { |
| 333 | 905 | id: clearButton | 906 | id: clearButton |
| 334 | 906 | objectName: "clear_button" | 907 | objectName: "clear_button" |
| 335 | 908 | activeFocusOnPress: false | ||
| 336 | 909 | |||
| 337 | 907 | anchors { | 910 | anchors { |
| 338 | 908 | top: parent.top | 911 | top: parent.top |
| 339 | 909 | right: rightPane.left | 912 | right: rightPane.left |
| 340 | 910 | 913 | ||
| 341 | === modified file 'modules/Ubuntu/Components/UbuntuListView.qml' | |||
| 342 | --- modules/Ubuntu/Components/UbuntuListView.qml 2014-04-23 08:50:20 +0000 | |||
| 343 | +++ modules/Ubuntu/Components/UbuntuListView.qml 2014-08-22 17:18:58 +0000 | |||
| 344 | @@ -92,8 +92,26 @@ | |||
| 345 | 92 | } | 92 | } |
| 346 | 93 | animation.start(); | 93 | animation.start(); |
| 347 | 94 | } | 94 | } |
| 348 | 95 | |||
| 349 | 96 | function requestFocus(reason) { | ||
| 350 | 97 | // lookup for the currentItem, and if it is a FocusScope, focus the view | ||
| 351 | 98 | // this will also focus the currentItem | ||
| 352 | 99 | if (root.currentItem && root.currentItem.hasOwnProperty("activeFocusOnPress")) { | ||
| 353 | 100 | root.forceActiveFocus(reason); | ||
| 354 | 101 | } | ||
| 355 | 102 | } | ||
| 356 | 95 | } | 103 | } |
| 357 | 96 | 104 | ||
| 358 | 105 | focus: true | ||
| 359 | 106 | |||
| 360 | 107 | /*! | ||
| 361 | 108 | \internal | ||
| 362 | 109 | Grab focus when moved, flicked or clicked | ||
| 363 | 110 | */ | ||
| 364 | 111 | onMovementStarted: priv.requestFocus(Qt.MouseFocusReason) | ||
| 365 | 112 | onFlickStarted: priv.requestFocus(Qt.MouseFocusReason) | ||
| 366 | 113 | Toolkit.Mouse.onClicked: priv.requestFocus(Qt.MouseFocusReason) | ||
| 367 | 114 | |||
| 368 | 97 | /*! | 115 | /*! |
| 369 | 98 | \preliminary | 116 | \preliminary |
| 370 | 99 | Expand the item at the given index. | 117 | Expand the item at the given index. |
| 371 | 100 | 118 | ||
| 372 | === modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp' | |||
| 373 | --- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp 2014-08-21 11:58:33 +0000 | |||
| 374 | +++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp 2014-08-22 17:18:58 +0000 | |||
| 375 | @@ -224,8 +224,7 @@ | |||
| 376 | 224 | { | 224 | { |
| 377 | 225 | QQuickItem::mousePressEvent(event); | 225 | QQuickItem::mousePressEvent(event); |
| 378 | 226 | Q_D(UCStyledItemBase); | 226 | Q_D(UCStyledItemBase); |
| 381 | 227 | // accept the event if the focus was possible. | 227 | requestFocus(Qt::MouseFocusReason); |
| 380 | 228 | event->setAccepted(requestFocus(Qt::MouseFocusReason)); | ||
| 382 | 229 | } | 228 | } |
| 383 | 230 | 229 | ||
| 384 | 231 | #include "moc_ucstyleditembase.cpp" | 230 | #include "moc_ucstyleditembase.cpp" |
| 385 | 232 | 231 | ||
| 386 | === modified file 'tests/unit_x11/tst_components/tst_datepicker.qml' | |||
| 387 | --- tests/unit_x11/tst_components/tst_datepicker.qml 2014-05-09 18:06:06 +0000 | |||
| 388 | +++ tests/unit_x11/tst_components/tst_datepicker.qml 2014-08-22 17:18:58 +0000 | |||
| 389 | @@ -59,7 +59,11 @@ | |||
| 390 | 59 | function getPickerLabel(picker, name) { | 59 | function getPickerLabel(picker, name) { |
| 391 | 60 | var pickerItem = findChild(picker, name); | 60 | var pickerItem = findChild(picker, name); |
| 392 | 61 | var pickerCurrent = findChild(pickerItem, "Picker_ViewLoader"); | 61 | var pickerCurrent = findChild(pickerItem, "Picker_ViewLoader"); |
| 394 | 62 | return pickerCurrent.item.currentItem.children[2]; | 62 | // note: find Label, Picker's label uses medium font size. The lookup must be changed |
| 395 | 63 | // if the fontSize is changed! | ||
| 396 | 64 | var pickerLabel = findChildWithProperty(pickerCurrent.item.currentItem, "fontSize", "medium"); | ||
| 397 | 65 | verify(pickerLabel, ("Label of %1 not accessible").arg(name)); | ||
| 398 | 66 | return pickerLabel; | ||
| 399 | 63 | } | 67 | } |
| 400 | 64 | function getPickerModel(picker, name) { | 68 | function getPickerModel(picker, name) { |
| 401 | 65 | var pickerItem = findInvisibleChild(picker, name); | 69 | var pickerItem = findInvisibleChild(picker, name); |
| 402 | @@ -318,7 +322,7 @@ | |||
| 403 | 318 | picker.mode = "Years|Months|Days"; | 322 | picker.mode = "Years|Months|Days"; |
| 404 | 319 | waitPickerMoving(); | 323 | waitPickerMoving(); |
| 405 | 320 | 324 | ||
| 407 | 321 | var yearLabel = getPickerLabel(picker, "PickerRow_YearPicker"); | 325 | var yearLabel = getPickerLabel(picker, "PickerRow_YearPicker", date.getFullYear()); |
| 408 | 322 | var monthLabel = getPickerLabel(picker, "PickerRow_MonthPicker"); | 326 | var monthLabel = getPickerLabel(picker, "PickerRow_MonthPicker"); |
| 409 | 323 | var monthModel = getPickerModel(picker, "PickerRow_MonthPicker"); | 327 | var monthModel = getPickerModel(picker, "PickerRow_MonthPicker"); |
| 410 | 324 | var dayLabel = getPickerLabel(picker, "PickerRow_DayPicker"); | 328 | var dayLabel = getPickerLabel(picker, "PickerRow_DayPicker"); |
| 411 | 325 | 329 | ||
| 412 | === added file 'tests/unit_x11/tst_components/tst_focus.qml' | |||
| 413 | --- tests/unit_x11/tst_components/tst_focus.qml 1970-01-01 00:00:00 +0000 | |||
| 414 | +++ tests/unit_x11/tst_components/tst_focus.qml 2014-08-22 17:18:58 +0000 | |||
| 415 | @@ -0,0 +1,240 @@ | |||
| 416 | 1 | /* | ||
| 417 | 2 | * Copyright 2014 Canonical Ltd. | ||
| 418 | 3 | * | ||
| 419 | 4 | * This program is free software; you can redistribute it and/or modify | ||
| 420 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
| 421 | 6 | * the Free Software Foundation; version 3. | ||
| 422 | 7 | * | ||
| 423 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 424 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 425 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 426 | 11 | * GNU Lesser General Public License for more details. | ||
| 427 | 12 | * | ||
| 428 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 429 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 430 | 15 | */ | ||
| 431 | 16 | |||
| 432 | 17 | import QtQuick 2.2 | ||
| 433 | 18 | import QtTest 1.0 | ||
| 434 | 19 | import Ubuntu.Test 1.0 | ||
| 435 | 20 | import Ubuntu.Components 1.1 | ||
| 436 | 21 | import Ubuntu.Components.Pickers 1.0 | ||
| 437 | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem | ||
| 438 | 23 | import Ubuntu.Components.Popups 1.0 | ||
| 439 | 24 | |||
| 440 | 25 | Item { | ||
| 441 | 26 | id: main | ||
| 442 | 27 | width: units.gu(50); height: units.gu(100) | ||
| 443 | 28 | |||
| 444 | 29 | property bool hasOSK: QuickUtils.inputMethodProvider !== "" | ||
| 445 | 30 | |||
| 446 | 31 | Flow { | ||
| 447 | 32 | anchors { | ||
| 448 | 33 | fill: parent | ||
| 449 | 34 | margins: units.gu(0.5) | ||
| 450 | 35 | } | ||
| 451 | 36 | spacing: units.gu(1) | ||
| 452 | 37 | |||
| 453 | 38 | UbuntuListView { | ||
| 454 | 39 | id: listView | ||
| 455 | 40 | width: units.gu(50) | ||
| 456 | 41 | height: units.gu(20) | ||
| 457 | 42 | clip: true | ||
| 458 | 43 | model: 10 | ||
| 459 | 44 | delegate: ListItem.Standard { | ||
| 460 | 45 | text: "Whatever" | ||
| 461 | 46 | } | ||
| 462 | 47 | } | ||
| 463 | 48 | TextField { | ||
| 464 | 49 | id: textField | ||
| 465 | 50 | text: "This is a text field with some text handling focus" | ||
| 466 | 51 | } | ||
| 467 | 52 | TextArea { | ||
| 468 | 53 | id: textArea | ||
| 469 | 54 | text: "This is a text area with some text handling focus" | ||
| 470 | 55 | } | ||
| 471 | 56 | Button { | ||
| 472 | 57 | id: button | ||
| 473 | 58 | text: "Press me" | ||
| 474 | 59 | } | ||
| 475 | 60 | CheckBox { | ||
| 476 | 61 | id: checkbox | ||
| 477 | 62 | text: "Check me" | ||
| 478 | 63 | } | ||
| 479 | 64 | Switch { | ||
| 480 | 65 | id: switchBox | ||
| 481 | 66 | } | ||
| 482 | 67 | Picker { | ||
| 483 | 68 | id: picker | ||
| 484 | 69 | model: 10 | ||
| 485 | 70 | } | ||
| 486 | 71 | Picker { | ||
| 487 | 72 | id: roundPicker | ||
| 488 | 73 | model: 10 | ||
| 489 | 74 | circular: true | ||
| 490 | 75 | } | ||
| 491 | 76 | Button { | ||
| 492 | 77 | id: pickerPanel | ||
| 493 | 78 | property date date: new Date() | ||
| 494 | 79 | text: Qt.formatDateTime(date, "yyyy/MMMM") | ||
| 495 | 80 | onClicked: PickerPanel.openDatePicker(pickerPanel, "date", "Years|Months") | ||
| 496 | 81 | } | ||
| 497 | 82 | Slider { | ||
| 498 | 83 | id: slider | ||
| 499 | 84 | } | ||
| 500 | 85 | ComboButton { | ||
| 501 | 86 | id: comboButton | ||
| 502 | 87 | Rectangle { | ||
| 503 | 88 | height: comboButton.comboListHeight | ||
| 504 | 89 | color: "blue" | ||
| 505 | 90 | } | ||
| 506 | 91 | } | ||
| 507 | 92 | Button { | ||
| 508 | 93 | id: popoverTest | ||
| 509 | 94 | text: "Popovers" | ||
| 510 | 95 | property Item popover | ||
| 511 | 96 | property Component popoverComponent | ||
| 512 | 97 | onClicked: { | ||
| 513 | 98 | popover = PopupUtils.open(popoverComponent) | ||
| 514 | 99 | } | ||
| 515 | 100 | } | ||
| 516 | 101 | } | ||
| 517 | 102 | |||
| 518 | 103 | Component { | ||
| 519 | 104 | id: dialogComponent | ||
| 520 | 105 | Dialog { | ||
| 521 | 106 | id: dialog | ||
| 522 | 107 | title: "TestDialog" | ||
| 523 | 108 | Button { | ||
| 524 | 109 | text: "close" | ||
| 525 | 110 | onClicked: PopupUtils.close(dialog) | ||
| 526 | 111 | } | ||
| 527 | 112 | } | ||
| 528 | 113 | } | ||
| 529 | 114 | |||
| 530 | 115 | Component { | ||
| 531 | 116 | id: popoverComponent | ||
| 532 | 117 | Popover { | ||
| 533 | 118 | id: popover | ||
| 534 | 119 | contentWidth: units.gu(20) | ||
| 535 | 120 | contentHeight: item.height | ||
| 536 | 121 | ListItem.Standard { | ||
| 537 | 122 | id: item | ||
| 538 | 123 | text: "close" | ||
| 539 | 124 | onClicked: PopupUtils.close(popover) | ||
| 540 | 125 | } | ||
| 541 | 126 | } | ||
| 542 | 127 | } | ||
| 543 | 128 | |||
| 544 | 129 | UbuntuTestCase { | ||
| 545 | 130 | name: "FocusingTests" | ||
| 546 | 131 | when: windowShown | ||
| 547 | 132 | |||
| 548 | 133 | SignalSpy { | ||
| 549 | 134 | id: popupCloseSpy | ||
| 550 | 135 | signalName: "onDestruction" | ||
| 551 | 136 | } | ||
| 552 | 137 | |||
| 553 | 138 | function initTestCase() { | ||
| 554 | 139 | textField.forceActiveFocus(); | ||
| 555 | 140 | } | ||
| 556 | 141 | function cleanup() { | ||
| 557 | 142 | // empty event buffer | ||
| 558 | 143 | wait(200); | ||
| 559 | 144 | popupCloseSpy.clear(); | ||
| 560 | 145 | popupCloseSpy.target = null; | ||
| 561 | 146 | } | ||
| 562 | 147 | |||
| 563 | 148 | // make this as the very first test executed | ||
| 564 | 149 | function test_0_transfer_focus_data() { | ||
| 565 | 150 | return [ | ||
| 566 | 151 | {tag: "TextArea", previousFocused: textField, focusOn: textArea, clickToDismiss: false}, | ||
| 567 | 152 | {tag: "Button", previousFocused: textArea, focusOn: button, clickToDismiss: false}, | ||
| 568 | 153 | {tag: "Checkbox", previousFocused: button, focusOn: checkbox, clickToDismiss: false}, | ||
| 569 | 154 | {tag: "Switch", previousFocused: checkbox, focusOn: switchBox, clickToDismiss: false}, | ||
| 570 | 155 | {tag: "Picker - linear", previousFocused: switchBox, focusOn: picker, clickToDismiss: false}, | ||
| 571 | 156 | {tag: "Picker - circular", previousFocused: picker, focusOn: roundPicker, clickToDismiss: false}, | ||
| 572 | 157 | {tag: "PickerPanel", previousFocused: roundPicker, focusOn: pickerPanel, clickToDismiss: true}, | ||
| 573 | 158 | {tag: "UbuntuListView", previousFocused: pickerPanel, focusOn: listView, clickToDismiss: false}, | ||
| 574 | 159 | {tag: "Slider", previousFocused: listView, focusOn: slider, clickToDismiss: false}, | ||
| 575 | 160 | {tag: "ComboButton", previousFocused: slider, focusOn: comboButton, clickToDismiss: false}, | ||
| 576 | 161 | ]; | ||
| 577 | 162 | } | ||
| 578 | 163 | function test_0_transfer_focus(data) { | ||
| 579 | 164 | // perform mouse press on | ||
| 580 | 165 | mouseClick(data.focusOn, centerOf(data.focusOn).x, centerOf(data.focusOn).y); | ||
| 581 | 166 | compare(data.previousFocused.focus, false, "Previous focus is still set!"); | ||
| 582 | 167 | compare(data.focusOn.focus, true, data.tag + " is not focused!"); | ||
| 583 | 168 | if (data.clickToDismiss) { | ||
| 584 | 169 | mouseClick(main, 0, 0); | ||
| 585 | 170 | } | ||
| 586 | 171 | waitForRendering(data.focusOn, 200); | ||
| 587 | 172 | } | ||
| 588 | 173 | |||
| 589 | 174 | function test_hide_osk_when_pickerpanel_opens() { | ||
| 590 | 175 | if (!main.hasOSK) { | ||
| 591 | 176 | skip("This functionality can be tested with OSK only."); | ||
| 592 | 177 | } | ||
| 593 | 178 | |||
| 594 | 179 | textField.forceActiveFocus(); | ||
| 595 | 180 | verify(textField.focus, "TextField is not focused"); | ||
| 596 | 181 | verify(Qt.inputMethod.visible, "OSK is hidden"); | ||
| 597 | 182 | mouseClick(pickerPanel, centerOf(pickerPanel).x, centerOf(pickerPanel).y); | ||
| 598 | 183 | verify(!Qt.inputMethod.visible, "OSK is visible still!"); | ||
| 599 | 184 | // remove panel/popover | ||
| 600 | 185 | mouseClick(main, 0, 0); | ||
| 601 | 186 | } | ||
| 602 | 187 | |||
| 603 | 188 | function test_textfield_clear_button_keeps_focus() { | ||
| 604 | 189 | textField.forceActiveFocus(); | ||
| 605 | 190 | var text = textField.text; | ||
| 606 | 191 | |||
| 607 | 192 | var clearButton = findChild(textField, "clear_button"); | ||
| 608 | 193 | verify(clearButton, "clearButton is not accessible!"); | ||
| 609 | 194 | var center = centerOf(clearButton); | ||
| 610 | 195 | mouseClick(clearButton, center.x, center.y); | ||
| 611 | 196 | compare(textField.text, "", "Text had not been cleared?"); | ||
| 612 | 197 | compare(textField.focus, true, "Focus had been stolen from text input"); | ||
| 613 | 198 | |||
| 614 | 199 | //restore | ||
| 615 | 200 | textField.text = text; | ||
| 616 | 201 | } | ||
| 617 | 202 | |||
| 618 | 203 | function test_combo_button_dropdown_focuses_component() { | ||
| 619 | 204 | textField.forceActiveFocus(); | ||
| 620 | 205 | var dropdownButton = findChild(comboButton, "combobutton_dropdown"); | ||
| 621 | 206 | verify(dropdownButton, "dropdown button is not accessible?"); | ||
| 622 | 207 | |||
| 623 | 208 | var center = centerOf(dropdownButton); | ||
| 624 | 209 | mouseClick(dropdownButton, center.x, center.y); | ||
| 625 | 210 | waitForRendering(comboButton); | ||
| 626 | 211 | compare(dropdownButton.focus, true, "Dropdown button hasn't got focused!"); | ||
| 627 | 212 | compare(comboButton.focus, true, "ComboButton hasn't been focused!"); | ||
| 628 | 213 | comboButton.expanded = false; | ||
| 629 | 214 | } | ||
| 630 | 215 | |||
| 631 | 216 | function test_popover_refocus_data() { | ||
| 632 | 217 | return [ | ||
| 633 | 218 | {tag: "Dialog", component: dialogComponent}, | ||
| 634 | 219 | {tag: "Popover", component: popoverComponent}, | ||
| 635 | 220 | ]; | ||
| 636 | 221 | } | ||
| 637 | 222 | |||
| 638 | 223 | function test_popover_refocus(data) { | ||
| 639 | 224 | popoverTest.popoverComponent = data.component; | ||
| 640 | 225 | var center = centerOf(popoverTest); | ||
| 641 | 226 | mouseClick(popoverTest, center.x, center.y); | ||
| 642 | 227 | verify(popoverTest.focus, "Button focus not gained."); | ||
| 643 | 228 | waitForRendering(popoverTest.popover); | ||
| 644 | 229 | popupCloseSpy.target = popoverTest.popover.Component; | ||
| 645 | 230 | |||
| 646 | 231 | var closeButton = findChildWithProperty(popoverTest.popover, "text", "close"); | ||
| 647 | 232 | verify(closeButton, "Close button not accessible"); | ||
| 648 | 233 | center = centerOf(closeButton); | ||
| 649 | 234 | mouseClick(closeButton, center.x, center.y); | ||
| 650 | 235 | verify(!popoverTest.focus, "Button focus not lost."); | ||
| 651 | 236 | popupCloseSpy.wait(); | ||
| 652 | 237 | verify(popoverTest.focus, "Button focus not restored."); | ||
| 653 | 238 | } | ||
| 654 | 239 | } | ||
| 655 | 240 | } | ||
| 656 | 0 | 241 | ||
| 657 | === modified file 'tests/unit_x11/tst_components/tst_tabs.qml' | |||
| 658 | --- tests/unit_x11/tst_components/tst_tabs.qml 2014-04-25 05:28:37 +0000 | |||
| 659 | +++ tests/unit_x11/tst_components/tst_tabs.qml 2014-08-22 17:18:58 +0000 | |||
| 660 | @@ -16,323 +16,108 @@ | |||
| 661 | 16 | 16 | ||
| 662 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.0 |
| 663 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
| 664 | 19 | import Ubuntu.Test 1.0 | ||
| 665 | 19 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.1 |
| 666 | 20 | 21 | ||
| 669 | 21 | Item { | 22 | MainView { |
| 670 | 22 | id: testCase | 23 | id: mainView |
| 671 | 23 | width: units.gu(50) | 24 | width: units.gu(50) |
| 672 | 24 | height: units.gu(80) | 25 | height: units.gu(80) |
| 673 | 25 | 26 | ||
| 674 | 26 | Tabs { | 27 | Tabs { |
| 860 | 27 | id: emptyTabs | 28 | id: tabs |
| 861 | 28 | } | 29 | Tab { |
| 862 | 29 | 30 | id: tab1 | |
| 863 | 30 | MainView { | 31 | title: "tab 1" |
| 864 | 31 | id: mainView | 32 | page: Page { |
| 865 | 32 | anchors.fill: parent | 33 | id: page1 |
| 866 | 33 | Tabs { | 34 | Button { |
| 867 | 34 | id: tabs | 35 | id: button |
| 868 | 35 | Tab { | 36 | anchors.centerIn: parent |
| 869 | 36 | id: tab1 | 37 | text: "click" |
| 870 | 37 | title: "tab 1" | 38 | } |
| 871 | 38 | page: Page { | 39 | } |
| 872 | 39 | id: page1 | 40 | } |
| 873 | 40 | Button { | 41 | Tab { |
| 874 | 41 | id: button | 42 | id: tab2 |
| 875 | 42 | anchors.centerIn: parent | 43 | title: "tab 2" |
| 876 | 43 | text: "click" | 44 | page: Page { |
| 877 | 44 | } | 45 | id: page2 |
| 878 | 45 | } | 46 | } |
| 879 | 46 | } | 47 | } |
| 880 | 47 | Tab { | 48 | Tab { |
| 881 | 48 | id: tab2 | 49 | id: tab3 |
| 882 | 49 | title: "tab 2" | 50 | title: "tab 3" |
| 883 | 50 | page: Page { | 51 | page: Page { |
| 884 | 51 | id: page2 | 52 | id: page3 |
| 885 | 52 | } | 53 | } |
| 886 | 53 | } | 54 | } |
| 887 | 54 | Tab { | 55 | Tab { |
| 888 | 55 | id: tab3 | 56 | id: tabFlick1 |
| 889 | 56 | title: "tab 3" | 57 | title: "flick" |
| 890 | 57 | page: Page { | 58 | page: Page { |
| 891 | 58 | id: page3 | 59 | Flickable { |
| 892 | 59 | } | 60 | id: flickable1 |
| 893 | 60 | } | 61 | anchors.fill: parent |
| 894 | 61 | Tab { | 62 | } |
| 895 | 62 | id: tabFlick1 | 63 | } |
| 896 | 63 | title: "flick" | 64 | } |
| 897 | 64 | page: Page { | 65 | Tab { |
| 898 | 65 | Flickable { | 66 | id: tabFlick2 |
| 899 | 66 | id: flickable1 | 67 | title: "flick 2" |
| 900 | 67 | anchors.fill: parent | 68 | page: Page { |
| 901 | 68 | } | 69 | Flickable { |
| 902 | 69 | } | 70 | id: flickable2 |
| 903 | 70 | } | 71 | anchors.fill: parent |
| 904 | 71 | Tab { | 72 | } |
| 905 | 72 | id: tabFlick2 | 73 | } |
| 906 | 73 | title: "flick 2" | 74 | } |
| 907 | 74 | page: Page { | 75 | Tab { |
| 908 | 75 | Flickable { | 76 | id: tabFlickLoader |
| 909 | 76 | id: flickable2 | 77 | title: "load" |
| 910 | 77 | anchors.fill: parent | 78 | page: Loader { |
| 911 | 78 | } | 79 | id: loader |
| 912 | 79 | } | 80 | sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent |
| 913 | 80 | } | 81 | } |
| 914 | 81 | Tab { | 82 | } |
| 915 | 82 | id: tabFlickLoader | 83 | Tab { |
| 916 | 83 | title: "load" | 84 | id: tabNoFlickLoader |
| 917 | 84 | page: Loader { | 85 | title: "loadNoFlick" |
| 918 | 85 | id: loader | 86 | page: Loader { |
| 919 | 86 | sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent | 87 | id: loaderNoFlick |
| 920 | 87 | } | 88 | anchors { |
| 921 | 88 | } | 89 | left: parent.left |
| 922 | 89 | Tab { | 90 | right: parent.right |
| 923 | 90 | id: tabNoFlickLoader | 91 | bottom: parent.bottom |
| 924 | 91 | title: "loadNoFlick" | 92 | } |
| 925 | 92 | page: Loader { | 93 | // height compes from the loaded Page |
| 926 | 93 | id: loaderNoFlick | 94 | sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null |
| 927 | 94 | anchors { | 95 | } |
| 928 | 95 | left: parent.left | 96 | } |
| 929 | 96 | right: parent.right | 97 | } |
| 930 | 97 | bottom: parent.bottom | 98 | Component { |
| 931 | 98 | } | 99 | id: pageComponent |
| 932 | 99 | // height compes from the loaded Page | 100 | Page { |
| 933 | 100 | sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null | 101 | title: "Loaded page" |
| 934 | 101 | } | 102 | property Flickable flick: loadedFlickable |
| 935 | 102 | } | 103 | Flickable { |
| 936 | 103 | } | 104 | id: loadedFlickable |
| 937 | 104 | Component { | 105 | anchors.fill: parent |
| 938 | 105 | id: pageComponent | 106 | contentHeight: 1000 |
| 939 | 106 | Page { | 107 | } |
| 940 | 107 | title: "Loaded page" | 108 | } |
| 941 | 108 | property Flickable flick: loadedFlickable | 109 | } |
| 942 | 109 | Flickable { | 110 | Component { |
| 943 | 110 | id: loadedFlickable | 111 | id: pageComponentNoFlick |
| 944 | 111 | anchors.fill: parent | 112 | Page { |
| 945 | 112 | contentHeight: 1000 | 113 | title: "Loaded page without flickable" |
| 946 | 113 | } | 114 | } |
| 947 | 114 | } | 115 | } |
| 948 | 115 | } | 116 | |
| 949 | 116 | Component { | 117 | UbuntuTestCase { |
| 765 | 117 | id: pageComponentNoFlick | ||
| 766 | 118 | Page { | ||
| 767 | 119 | title: "Loaded page without flickable" | ||
| 768 | 120 | } | ||
| 769 | 121 | } | ||
| 770 | 122 | } | ||
| 771 | 123 | |||
| 772 | 124 | ListModel { | ||
| 773 | 125 | id: inputModel | ||
| 774 | 126 | Component.onCompleted: { | ||
| 775 | 127 | append({ "name": "tab 1" }); | ||
| 776 | 128 | insert(0, { "name": "tab 0" }); | ||
| 777 | 129 | append({ "name": "tab 3" }); | ||
| 778 | 130 | insert(2, { "name": "tab 2" }); | ||
| 779 | 131 | } | ||
| 780 | 132 | } | ||
| 781 | 133 | |||
| 782 | 134 | Tabs { | ||
| 783 | 135 | id: tabsWithRepeater | ||
| 784 | 136 | Repeater { | ||
| 785 | 137 | objectName: "tabsRepeater" | ||
| 786 | 138 | id: tabsRepeater | ||
| 787 | 139 | model: inputModel | ||
| 788 | 140 | Tab { | ||
| 789 | 141 | title: name | ||
| 790 | 142 | } | ||
| 791 | 143 | } | ||
| 792 | 144 | } | ||
| 793 | 145 | |||
| 794 | 146 | Tabs { | ||
| 795 | 147 | id: repeaterTabs | ||
| 796 | 148 | |||
| 797 | 149 | Repeater { | ||
| 798 | 150 | objectName: "repeater" | ||
| 799 | 151 | id: repeater | ||
| 800 | 152 | Tab { | ||
| 801 | 153 | title: modelData | ||
| 802 | 154 | } | ||
| 803 | 155 | } | ||
| 804 | 156 | } | ||
| 805 | 157 | |||
| 806 | 158 | Tabs { | ||
| 807 | 159 | id: twoRepeaters | ||
| 808 | 160 | |||
| 809 | 161 | Repeater { | ||
| 810 | 162 | objectName: "firstRepeater" | ||
| 811 | 163 | id: firstRepeater | ||
| 812 | 164 | model: inputModel | ||
| 813 | 165 | Tab { | ||
| 814 | 166 | title: name | ||
| 815 | 167 | } | ||
| 816 | 168 | } | ||
| 817 | 169 | |||
| 818 | 170 | Repeater { | ||
| 819 | 171 | objectName: "secondRepeater" | ||
| 820 | 172 | id: secondRepeater | ||
| 821 | 173 | model: testCase.listModel | ||
| 822 | 174 | Tab { | ||
| 823 | 175 | title: modelData | ||
| 824 | 176 | } | ||
| 825 | 177 | } | ||
| 826 | 178 | } | ||
| 827 | 179 | |||
| 828 | 180 | property var listModel: ["tab #0", "tab #1", "tab #2", "tab #3"]; | ||
| 829 | 181 | |||
| 830 | 182 | Tabs { | ||
| 831 | 183 | id: twinRepeaters | ||
| 832 | 184 | ListModel { | ||
| 833 | 185 | id: twinModel | ||
| 834 | 186 | Component.onCompleted: { | ||
| 835 | 187 | append({ "name": "twintab 1" }); | ||
| 836 | 188 | insert(0, { "name": "twintab 0" }); | ||
| 837 | 189 | append({ "name": "twintab 3" }); | ||
| 838 | 190 | insert(2, { "name": "twintab 2" }); | ||
| 839 | 191 | } | ||
| 840 | 192 | } | ||
| 841 | 193 | Repeater { | ||
| 842 | 194 | objectName: "tabsRepeater" | ||
| 843 | 195 | id: twinRepeater1 | ||
| 844 | 196 | model: twinModel | ||
| 845 | 197 | Tab { | ||
| 846 | 198 | title: name | ||
| 847 | 199 | } | ||
| 848 | 200 | } | ||
| 849 | 201 | Repeater { | ||
| 850 | 202 | objectName: "tabsRepeater" | ||
| 851 | 203 | id: twinRepeater2 | ||
| 852 | 204 | model: twinModel | ||
| 853 | 205 | Tab { | ||
| 854 | 206 | title: name | ||
| 855 | 207 | } | ||
| 856 | 208 | } | ||
| 857 | 209 | } | ||
| 858 | 210 | |||
| 859 | 211 | TestCase { | ||
| 950 | 212 | name: "TabsAPI" | 118 | name: "TabsAPI" |
| 951 | 213 | when: windowShown | 119 | when: windowShown |
| 952 | 214 | 120 | ||
| 953 | 215 | /* | ||
| 954 | 216 | The following testcases are all related to bug #1253804 | ||
| 955 | 217 | */ | ||
| 956 | 218 | function test_tabOrder_bug1253804() { | ||
| 957 | 219 | var tabsModel = tabsWithRepeater.__model; | ||
| 958 | 220 | |||
| 959 | 221 | compare(tabsRepeater.count, inputModel.count, "Incorrect number of tabs in Tabs"); | ||
| 960 | 222 | compare(tabsModel.count, tabsRepeater.count, "Incorrect number of tabs in TabBar"); | ||
| 961 | 223 | for (var i=0; i < tabsModel.count; i++) { | ||
| 962 | 224 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 963 | 225 | } | ||
| 964 | 226 | |||
| 965 | 227 | //shufle | ||
| 966 | 228 | inputModel.move(1, 2, 1); | ||
| 967 | 229 | inputModel.move(3, 0, 1); | ||
| 968 | 230 | inputModel.move(1, 3, 1); | ||
| 969 | 231 | // wait few miliseconds | ||
| 970 | 232 | wait(50); | ||
| 971 | 233 | for (i=0; i < tabsModel.count; i++) { | ||
| 972 | 234 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles after shuffling don't match for index "+i); | ||
| 973 | 235 | } | ||
| 974 | 236 | |||
| 975 | 237 | // set it to null | ||
| 976 | 238 | tabsRepeater.model = null; | ||
| 977 | 239 | compare(tabsWithRepeater.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 978 | 240 | } | ||
| 979 | 241 | |||
| 980 | 242 | function test_repeaterTabs() { | ||
| 981 | 243 | repeater.model = inputModel; | ||
| 982 | 244 | var tabsModel = repeaterTabs.__model; | ||
| 983 | 245 | |||
| 984 | 246 | compare(repeater.count, inputModel.count, "Incorrect number of tabs in Tabs"); | ||
| 985 | 247 | compare(tabsModel.count, repeater.count, "Incorrect number of tabs in TabBar"); | ||
| 986 | 248 | for (var i=0; i < tabsModel.count; i++) { | ||
| 987 | 249 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 988 | 250 | } | ||
| 989 | 251 | |||
| 990 | 252 | // clear repeaterTabs | ||
| 991 | 253 | repeater.model = null; | ||
| 992 | 254 | compare(repeaterTabs.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 993 | 255 | } | ||
| 994 | 256 | |||
| 995 | 257 | function test_repeaterTabs_arrayAsModel() { | ||
| 996 | 258 | repeater.model = testCase.listModel; | ||
| 997 | 259 | var tabsModel = repeaterTabs.__model; | ||
| 998 | 260 | |||
| 999 | 261 | compare(repeater.count, testCase.listModel.length, "Incorrect number of tabs in Tabs"); | ||
| 1000 | 262 | compare(tabsModel.count, repeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1001 | 263 | for (var i=0; i < tabsModel.count; i++) { | ||
| 1002 | 264 | compare(tabsModel.get(i).title, testCase.listModel[i], "Tab titles don't match for index "+i); | ||
| 1003 | 265 | } | ||
| 1004 | 266 | |||
| 1005 | 267 | // shuffling elements in an array is not detectable in Repeater | ||
| 1006 | 268 | var x = testCase.listModel[1]; | ||
| 1007 | 269 | testCase.listModel[1] = testCase.listModel[0]; | ||
| 1008 | 270 | testCase.listModel[0] = x; | ||
| 1009 | 271 | expectFailContinue("", "Array changes are not detected by repeaters"); | ||
| 1010 | 272 | compare(tabsModel.get(0).title, testCase.listModel[0], "Tab titles don't match for index 0"); | ||
| 1011 | 273 | expectFailContinue("", "Array changes are not detected by repeaters"); | ||
| 1012 | 274 | compare(tabsModel.get(1).title, testCase.listModel[1], "Tab titles don't match for index 0"); | ||
| 1013 | 275 | |||
| 1014 | 276 | // clear repeaterTabs | ||
| 1015 | 277 | repeater.model = null; | ||
| 1016 | 278 | compare(repeaterTabs.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1017 | 279 | |||
| 1018 | 280 | } | ||
| 1019 | 281 | |||
| 1020 | 282 | function test_twoRepeaters() { | ||
| 1021 | 283 | var tabsModel = twoRepeaters.__model; | ||
| 1022 | 284 | var secondRepeaterModel = secondRepeater.model; | ||
| 1023 | 285 | |||
| 1024 | 286 | compare(tabsModel.count, firstRepeater.count + secondRepeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1025 | 287 | for (var i = 0; i < firstRepeater.count; i++) { | ||
| 1026 | 288 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 1027 | 289 | } | ||
| 1028 | 290 | for (i = firstRepeater.count; i < firstRepeater.count + secondRepeater.count; i++) { | ||
| 1029 | 291 | compare(tabsModel.get(i).title, secondRepeaterModel[i - firstRepeater.count], "Tab titles don't match for index "+i); | ||
| 1030 | 292 | } | ||
| 1031 | 293 | } | ||
| 1032 | 294 | |||
| 1033 | 295 | function test_twinRepeaters() { | ||
| 1034 | 296 | var tabsModel = twinRepeaters.__model; | ||
| 1035 | 297 | |||
| 1036 | 298 | compare(twinRepeater1.count, twinModel.count, "Incorrect number of tabs in the first repeater"); | ||
| 1037 | 299 | compare(twinRepeater2.count, twinModel.count, "Incorrect number of tabs in the second repeater"); | ||
| 1038 | 300 | compare(tabsModel.count, twinRepeater1.count + twinRepeater2.count, "Incorrect number of tabs in TabBar"); | ||
| 1039 | 301 | for (var j = 0; j < 2; j++) { | ||
| 1040 | 302 | for (var i = 0; i < twinModel.count; i++) { | ||
| 1041 | 303 | var index = j * twinModel.count + i; | ||
| 1042 | 304 | compare(tabsModel.get(index).title, twinModel.get(i).name, "Tab titles don't match for Tabs index " + index); | ||
| 1043 | 305 | } | ||
| 1044 | 306 | } | ||
| 1045 | 307 | |||
| 1046 | 308 | //shuffle | ||
| 1047 | 309 | twinModel.move(1, 2, 1); | ||
| 1048 | 310 | twinModel.move(3, 0, 1); | ||
| 1049 | 311 | twinModel.move(1, 3, 1); | ||
| 1050 | 312 | // wait few miliseconds till Tabs update is realized | ||
| 1051 | 313 | wait(50); | ||
| 1052 | 314 | |||
| 1053 | 315 | /* FIXME | ||
| 1054 | 316 | for (var j = 0; j < 2; j++) { | ||
| 1055 | 317 | for (var i = 0; i < twinModel.count; i++) { | ||
| 1056 | 318 | var index = j * twinModel.count + i; | ||
| 1057 | 319 | compare(tabsModel.get(index).title, twinModel.get(i).name, "Tab titles don't match for Tabs index " + index); | ||
| 1058 | 320 | } | ||
| 1059 | 321 | } | ||
| 1060 | 322 | */ | ||
| 1061 | 323 | |||
| 1062 | 324 | // set it to null | ||
| 1063 | 325 | twinRepeater1.model = null; | ||
| 1064 | 326 | twinRepeater2.model = null; | ||
| 1065 | 327 | compare(twinRepeaters.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1066 | 328 | } | ||
| 1067 | 329 | |||
| 1068 | 330 | function test_emptyTabs() { | ||
| 1069 | 331 | compare(emptyTabs.selectedTabIndex, -1, "The default value for selectedTabIndex is -1 when there are no tabs"); | ||
| 1070 | 332 | compare(emptyTabs.selectedTab, null, "The default selected tab is null when there are no tabs"); | ||
| 1071 | 333 | compare(emptyTabs.currentPage, null, "The default currentPage is null when there are no tabs"); | ||
| 1072 | 334 | } | ||
| 1073 | 335 | |||
| 1074 | 336 | /* FIXME | 121 | /* FIXME |
| 1075 | 337 | function test_tabsDefaults() { | 122 | function test_tabsDefaults() { |
| 1076 | 338 | compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents"); | 123 | compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents"); |
| 1077 | @@ -412,8 +197,10 @@ | |||
| 1078 | 412 | 197 | ||
| 1079 | 413 | function test_deactivateByAppInteraction() { | 198 | function test_deactivateByAppInteraction() { |
| 1080 | 414 | tabs.tabBar.selectionMode = true; | 199 | tabs.tabBar.selectionMode = true; |
| 1081 | 200 | tabs.selectedTabIndex = 0; | ||
| 1082 | 201 | waitForRendering(tabs.tabBar, 400); | ||
| 1083 | 415 | compare(tabs.tabBar.selectionMode, true, "Tab bar can be put into selection mode"); | 202 | compare(tabs.tabBar.selectionMode, true, "Tab bar can be put into selection mode"); |
| 1085 | 416 | mouseClick(button, units.gu(1), units.gu(1), Qt.LeftButton); | 203 | mouseClick(button, centerOf(button).x, centerOf(button).y); |
| 1086 | 417 | compare(tabs.tabBar.selectionMode, false, "Tab bar deactivated by interacting with the page contents"); | 204 | compare(tabs.tabBar.selectionMode, false, "Tab bar deactivated by interacting with the page contents"); |
| 1087 | 418 | } | 205 | } |
| 1088 | 419 | 206 | ||
| 1089 | 420 | 207 | ||
| 1090 | === added file 'tests/unit_x11/tst_components/tst_tabs_empty.qml' | |||
| 1091 | --- tests/unit_x11/tst_components/tst_tabs_empty.qml 1970-01-01 00:00:00 +0000 | |||
| 1092 | +++ tests/unit_x11/tst_components/tst_tabs_empty.qml 2014-08-22 17:18:58 +0000 | |||
| 1093 | @@ -0,0 +1,41 @@ | |||
| 1094 | 1 | /* | ||
| 1095 | 2 | * Copyright 2014 Canonical Ltd. | ||
| 1096 | 3 | * | ||
| 1097 | 4 | * This program is free software; you can redistribute it and/or modify | ||
| 1098 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
| 1099 | 6 | * the Free Software Foundation; version 3. | ||
| 1100 | 7 | * | ||
| 1101 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1102 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1103 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1104 | 11 | * GNU Lesser General Public License for more details. | ||
| 1105 | 12 | * | ||
| 1106 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 1107 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1108 | 15 | */ | ||
| 1109 | 16 | |||
| 1110 | 17 | import QtQuick 2.2 | ||
| 1111 | 18 | import Ubuntu.Components 1.1 | ||
| 1112 | 19 | import Ubuntu.Test 1.0 | ||
| 1113 | 20 | |||
| 1114 | 21 | MainView { | ||
| 1115 | 22 | width: units.gu(50) | ||
| 1116 | 23 | height: units.gu(100) | ||
| 1117 | 24 | |||
| 1118 | 25 | useDeprecatedToolbar: true | ||
| 1119 | 26 | |||
| 1120 | 27 | Tabs { | ||
| 1121 | 28 | id: empty | ||
| 1122 | 29 | } | ||
| 1123 | 30 | |||
| 1124 | 31 | UbuntuTestCase { | ||
| 1125 | 32 | name: "EmptyTabs" | ||
| 1126 | 33 | when: windowShown | ||
| 1127 | 34 | |||
| 1128 | 35 | function test_emptyTabs() { | ||
| 1129 | 36 | compare(empty.selectedTabIndex, -1, "The default value for selectedTabIndex is -1 when there are no tabs"); | ||
| 1130 | 37 | compare(empty.selectedTab, null, "The default selected tab is null when there are no tabs"); | ||
| 1131 | 38 | compare(empty.currentPage, null, "The default currentPage is null when there are no tabs"); | ||
| 1132 | 39 | } | ||
| 1133 | 40 | } | ||
| 1134 | 41 | } | ||
| 1135 | 0 | 42 | ||
| 1136 | === added file 'tests/unit_x11/tst_components/tst_tabs_with_repeater.qml' | |||
| 1137 | --- tests/unit_x11/tst_components/tst_tabs_with_repeater.qml 1970-01-01 00:00:00 +0000 | |||
| 1138 | +++ tests/unit_x11/tst_components/tst_tabs_with_repeater.qml 2014-08-22 17:18:58 +0000 | |||
| 1139 | @@ -0,0 +1,234 @@ | |||
| 1140 | 1 | /* | ||
| 1141 | 2 | * Copyright 2014 Canonical Ltd. | ||
| 1142 | 3 | * | ||
| 1143 | 4 | * This program is free software; you can redistribute it and/or modify | ||
| 1144 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
| 1145 | 6 | * the Free Software Foundation; version 3. | ||
| 1146 | 7 | * | ||
| 1147 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1148 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1149 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1150 | 11 | * GNU Lesser General Public License for more details. | ||
| 1151 | 12 | * | ||
| 1152 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 1153 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1154 | 15 | */ | ||
| 1155 | 16 | |||
| 1156 | 17 | import QtQuick 2.2 | ||
| 1157 | 18 | import Ubuntu.Components 1.1 | ||
| 1158 | 19 | import Ubuntu.Test 1.0 | ||
| 1159 | 20 | |||
| 1160 | 21 | MainView { | ||
| 1161 | 22 | id: testCase | ||
| 1162 | 23 | width: units.gu(50) | ||
| 1163 | 24 | height: units.gu(100) | ||
| 1164 | 25 | |||
| 1165 | 26 | useDeprecatedToolbar: true | ||
| 1166 | 27 | |||
| 1167 | 28 | ListModel { | ||
| 1168 | 29 | id: inputModel | ||
| 1169 | 30 | Component.onCompleted: { | ||
| 1170 | 31 | append({ "name": "tab 1" }); | ||
| 1171 | 32 | insert(0, { "name": "tab 0" }); | ||
| 1172 | 33 | append({ "name": "tab 3" }); | ||
| 1173 | 34 | insert(2, { "name": "tab 2" }); | ||
| 1174 | 35 | } | ||
| 1175 | 36 | } | ||
| 1176 | 37 | |||
| 1177 | 38 | Tabs { | ||
| 1178 | 39 | id: tabsWithRepeater | ||
| 1179 | 40 | Repeater { | ||
| 1180 | 41 | objectName: "tabsRepeater" | ||
| 1181 | 42 | id: tabsRepeater | ||
| 1182 | 43 | model: inputModel | ||
| 1183 | 44 | Tab { | ||
| 1184 | 45 | title: name | ||
| 1185 | 46 | } | ||
| 1186 | 47 | } | ||
| 1187 | 48 | } | ||
| 1188 | 49 | |||
| 1189 | 50 | Tabs { | ||
| 1190 | 51 | id: repeaterTabs | ||
| 1191 | 52 | |||
| 1192 | 53 | Repeater { | ||
| 1193 | 54 | objectName: "repeater" | ||
| 1194 | 55 | id: repeater | ||
| 1195 | 56 | Tab { | ||
| 1196 | 57 | title: modelData | ||
| 1197 | 58 | } | ||
| 1198 | 59 | } | ||
| 1199 | 60 | } | ||
| 1200 | 61 | |||
| 1201 | 62 | Tabs { | ||
| 1202 | 63 | id: twoRepeaters | ||
| 1203 | 64 | |||
| 1204 | 65 | Repeater { | ||
| 1205 | 66 | objectName: "firstRepeater" | ||
| 1206 | 67 | id: firstRepeater | ||
| 1207 | 68 | model: inputModel | ||
| 1208 | 69 | Tab { | ||
| 1209 | 70 | title: name | ||
| 1210 | 71 | } | ||
| 1211 | 72 | } | ||
| 1212 | 73 | |||
| 1213 | 74 | Repeater { | ||
| 1214 | 75 | objectName: "secondRepeater" | ||
| 1215 | 76 | id: secondRepeater | ||
| 1216 | 77 | model: testCase.listModel | ||
| 1217 | 78 | Tab { | ||
| 1218 | 79 | title: modelData | ||
| 1219 | 80 | } | ||
| 1220 | 81 | } | ||
| 1221 | 82 | } | ||
| 1222 | 83 | |||
| 1223 | 84 | property var listModel: ["tab #0", "tab #1", "tab #2", "tab #3"]; | ||
| 1224 | 85 | |||
| 1225 | 86 | Tabs { | ||
| 1226 | 87 | id: twinRepeaters | ||
| 1227 | 88 | ListModel { | ||
| 1228 | 89 | id: twinModel | ||
| 1229 | 90 | Component.onCompleted: { | ||
| 1230 | 91 | append({ "name": "twintab 1" }); | ||
| 1231 | 92 | insert(0, { "name": "twintab 0" }); | ||
| 1232 | 93 | append({ "name": "twintab 3" }); | ||
| 1233 | 94 | insert(2, { "name": "twintab 2" }); | ||
| 1234 | 95 | } | ||
| 1235 | 96 | } | ||
| 1236 | 97 | Repeater { | ||
| 1237 | 98 | objectName: "tabsRepeater" | ||
| 1238 | 99 | id: twinRepeater1 | ||
| 1239 | 100 | model: twinModel | ||
| 1240 | 101 | Tab { | ||
| 1241 | 102 | title: name | ||
| 1242 | 103 | } | ||
| 1243 | 104 | } | ||
| 1244 | 105 | Repeater { | ||
| 1245 | 106 | objectName: "tabsRepeater" | ||
| 1246 | 107 | id: twinRepeater2 | ||
| 1247 | 108 | model: twinModel | ||
| 1248 | 109 | Tab { | ||
| 1249 | 110 | title: name | ||
| 1250 | 111 | } | ||
| 1251 | 112 | } | ||
| 1252 | 113 | } | ||
| 1253 | 114 | |||
| 1254 | 115 | UbuntuTestCase { | ||
| 1255 | 116 | name: "TabsWithRepeater" | ||
| 1256 | 117 | when: windowShown | ||
| 1257 | 118 | |||
| 1258 | 119 | /* | ||
| 1259 | 120 | The following testcases are all related to bug #1253804 | ||
| 1260 | 121 | */ | ||
| 1261 | 122 | function test_tabOrder_bug1253804() { | ||
| 1262 | 123 | var tabsModel = tabsWithRepeater.__model; | ||
| 1263 | 124 | |||
| 1264 | 125 | compare(tabsRepeater.count, inputModel.count, "Incorrect number of tabs in Tabs"); | ||
| 1265 | 126 | compare(tabsModel.count, tabsRepeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1266 | 127 | for (var i=0; i < tabsModel.count; i++) { | ||
| 1267 | 128 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 1268 | 129 | } | ||
| 1269 | 130 | |||
| 1270 | 131 | //shufle | ||
| 1271 | 132 | inputModel.move(1, 2, 1); | ||
| 1272 | 133 | inputModel.move(3, 0, 1); | ||
| 1273 | 134 | inputModel.move(1, 3, 1); | ||
| 1274 | 135 | // wait few miliseconds | ||
| 1275 | 136 | wait(50); | ||
| 1276 | 137 | for (i=0; i < tabsModel.count; i++) { | ||
| 1277 | 138 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles after shuffling don't match for index "+i); | ||
| 1278 | 139 | } | ||
| 1279 | 140 | |||
| 1280 | 141 | // set it to null | ||
| 1281 | 142 | tabsRepeater.model = null; | ||
| 1282 | 143 | compare(tabsWithRepeater.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1283 | 144 | } | ||
| 1284 | 145 | |||
| 1285 | 146 | function test_repeaterTabs() { | ||
| 1286 | 147 | repeater.model = inputModel; | ||
| 1287 | 148 | var tabsModel = repeaterTabs.__model; | ||
| 1288 | 149 | |||
| 1289 | 150 | compare(repeater.count, inputModel.count, "Incorrect number of tabs in Tabs"); | ||
| 1290 | 151 | compare(tabsModel.count, repeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1291 | 152 | for (var i=0; i < tabsModel.count; i++) { | ||
| 1292 | 153 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 1293 | 154 | } | ||
| 1294 | 155 | |||
| 1295 | 156 | // clear repeaterTabs | ||
| 1296 | 157 | repeater.model = null; | ||
| 1297 | 158 | compare(repeaterTabs.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1298 | 159 | } | ||
| 1299 | 160 | |||
| 1300 | 161 | function test_repeaterTabs_arrayAsModel() { | ||
| 1301 | 162 | repeater.model = testCase.listModel; | ||
| 1302 | 163 | var tabsModel = repeaterTabs.__model; | ||
| 1303 | 164 | |||
| 1304 | 165 | compare(repeater.count, testCase.listModel.length, "Incorrect number of tabs in Tabs"); | ||
| 1305 | 166 | compare(tabsModel.count, repeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1306 | 167 | for (var i=0; i < tabsModel.count; i++) { | ||
| 1307 | 168 | compare(tabsModel.get(i).title, testCase.listModel[i], "Tab titles don't match for index "+i); | ||
| 1308 | 169 | } | ||
| 1309 | 170 | |||
| 1310 | 171 | // shuffling elements in an array is not detectable in Repeater | ||
| 1311 | 172 | var x = testCase.listModel[1]; | ||
| 1312 | 173 | testCase.listModel[1] = testCase.listModel[0]; | ||
| 1313 | 174 | testCase.listModel[0] = x; | ||
| 1314 | 175 | expectFailContinue("", "Array changes are not detected by repeaters"); | ||
| 1315 | 176 | compare(tabsModel.get(0).title, testCase.listModel[0], "Tab titles don't match for index 0"); | ||
| 1316 | 177 | expectFailContinue("", "Array changes are not detected by repeaters"); | ||
| 1317 | 178 | compare(tabsModel.get(1).title, testCase.listModel[1], "Tab titles don't match for index 0"); | ||
| 1318 | 179 | |||
| 1319 | 180 | // clear repeaterTabs | ||
| 1320 | 181 | repeater.model = null; | ||
| 1321 | 182 | compare(repeaterTabs.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1322 | 183 | |||
| 1323 | 184 | } | ||
| 1324 | 185 | |||
| 1325 | 186 | function test_twoRepeaters() { | ||
| 1326 | 187 | var tabsModel = twoRepeaters.__model; | ||
| 1327 | 188 | var secondRepeaterModel = secondRepeater.model; | ||
| 1328 | 189 | |||
| 1329 | 190 | compare(tabsModel.count, firstRepeater.count + secondRepeater.count, "Incorrect number of tabs in TabBar"); | ||
| 1330 | 191 | for (var i = 0; i < firstRepeater.count; i++) { | ||
| 1331 | 192 | compare(tabsModel.get(i).title, inputModel.get(i).name, "Tab titles don't match for index "+i); | ||
| 1332 | 193 | } | ||
| 1333 | 194 | for (i = firstRepeater.count; i < firstRepeater.count + secondRepeater.count; i++) { | ||
| 1334 | 195 | compare(tabsModel.get(i).title, secondRepeaterModel[i - firstRepeater.count], "Tab titles don't match for index "+i); | ||
| 1335 | 196 | } | ||
| 1336 | 197 | } | ||
| 1337 | 198 | |||
| 1338 | 199 | function test_twinRepeaters() { | ||
| 1339 | 200 | var tabsModel = twinRepeaters.__model; | ||
| 1340 | 201 | |||
| 1341 | 202 | compare(twinRepeater1.count, twinModel.count, "Incorrect number of tabs in the first repeater"); | ||
| 1342 | 203 | compare(twinRepeater2.count, twinModel.count, "Incorrect number of tabs in the second repeater"); | ||
| 1343 | 204 | compare(tabsModel.count, twinRepeater1.count + twinRepeater2.count, "Incorrect number of tabs in TabBar"); | ||
| 1344 | 205 | for (var j = 0; j < 2; j++) { | ||
| 1345 | 206 | for (var i = 0; i < twinModel.count; i++) { | ||
| 1346 | 207 | var index = j * twinModel.count + i; | ||
| 1347 | 208 | compare(tabsModel.get(index).title, twinModel.get(i).name, "Tab titles don't match for Tabs index " + index); | ||
| 1348 | 209 | } | ||
| 1349 | 210 | } | ||
| 1350 | 211 | |||
| 1351 | 212 | //shuffle | ||
| 1352 | 213 | twinModel.move(1, 2, 1); | ||
| 1353 | 214 | twinModel.move(3, 0, 1); | ||
| 1354 | 215 | twinModel.move(1, 3, 1); | ||
| 1355 | 216 | // wait few miliseconds till Tabs update is realized | ||
| 1356 | 217 | wait(50); | ||
| 1357 | 218 | |||
| 1358 | 219 | /* FIXME | ||
| 1359 | 220 | for (var j = 0; j < 2; j++) { | ||
| 1360 | 221 | for (var i = 0; i < twinModel.count; i++) { | ||
| 1361 | 222 | var index = j * twinModel.count + i; | ||
| 1362 | 223 | compare(tabsModel.get(index).title, twinModel.get(i).name, "Tab titles don't match for Tabs index " + index); | ||
| 1363 | 224 | } | ||
| 1364 | 225 | } | ||
| 1365 | 226 | */ | ||
| 1366 | 227 | |||
| 1367 | 228 | // set it to null | ||
| 1368 | 229 | twinRepeater1.model = null; | ||
| 1369 | 230 | twinRepeater2.model = null; | ||
| 1370 | 231 | compare(twinRepeaters.__model.count, 0, "There are still tabs left after repeater model is reset"); | ||
| 1371 | 232 | } | ||
| 1372 | 233 | } | ||
| 1373 | 234 | } | ||
FAILED: Continuous integration, rev:1214
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://