Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/triggerComboButtonCorrectly into lp:ubuntu-ui-toolkit/staging

  1. triggerComboButtonCorrectly
  2. Merge into staging
Proposed by Christian Dywan on 2016-09-13
Status: Merged
Approved by: Zsombor Egri on 2016-09-13
Approved revision: 2096
Merged at revision: 2100
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/triggerComboButtonCorrectly
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 42 lines (+6/-8)
2 files modified
src/imports/Components/1.3/ComboButton.qml (+1/-5)
tests/unit/visual/tst_focus.13.qml (+5/-3)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/triggerComboButtonCorrectly
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-09-13
Zsombor Egri (community) 2016-09-13 Approve on 2016-09-13
Review via email: mp+305614@code.launchpad.net

Commit Message

Correctly test and fix trigger override of ComboButton

To post a comment you must log in.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Zsombor Egri (zsombi) wrote :

bahh, no brainer :D

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2096
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/742/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1388
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1388/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1395
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1179
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1145
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6269/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6268
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6265
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6264
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6266

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/742/rebuild

review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Components/1.3/ComboButton.qml'
2--- src/imports/Components/1.3/ComboButton.qml 2016-07-22 15:01:38 +0000
3+++ src/imports/Components/1.3/ComboButton.qml 2016-09-13 15:18:55 +0000
4@@ -336,11 +336,7 @@
5 }
6
7 Keys.onReleased: {
8- if (event.key == Qt.Key_Enter || event.key == Qt.Key_Return) {
9- // Enter or Return should trigger, not expand
10- event.accepted = true;
11- combo.trigger();
12- } else if (event.key == Qt.Key_Space) {
13+ if (event.key == Qt.Key_Space) {
14 // Space should expand, not trigger
15 event.accepted = true;
16 combo.expanded = !combo.expanded;
17
18=== modified file 'tests/unit/visual/tst_focus.13.qml'
19--- tests/unit/visual/tst_focus.13.qml 2016-07-22 15:01:38 +0000
20+++ tests/unit/visual/tst_focus.13.qml 2016-09-13 15:18:55 +0000
21@@ -150,6 +150,8 @@
22 height: comboButton.comboListHeight
23 color: "blue"
24 }
25+ property bool override: false
26+ Keys.onReleased: event.accepted = override
27 }
28 Button {
29 id: popoverTest
30@@ -451,9 +453,9 @@
31 {tag: "ListItem/Enter", key: Qt.Key_Enter, item: listItem, signalName: 'onClicked'},
32 {tag: "ListItem/Return", key: Qt.Key_Return, item: listItem, signalName: 'onClicked'},
33 {tag: "ListItem/Space", key: Qt.Key_Space, item: listItem, signalName: 'onClicked'},
34- {tag: "ComboButton/Enter", key: Qt.Key_Enter, item: button , signalName: 'onTriggered'},
35- {tag: "ComboButton/Return", key: Qt.Key_Return, item: button, signalName: 'onTriggered'},
36- {tag: "ComboButton/Space", key: Qt.Key_Space, item: button, signalName: 'onTriggered'},
37+ {tag: "ComboButton/Enter", key: Qt.Key_Enter, item: comboButton , signalName: 'onTriggered'},
38+ {tag: "ComboButton/Return", key: Qt.Key_Return, item: comboButton, signalName: 'onTriggered'},
39+ {tag: "ComboButton/Space", key: Qt.Key_Space, item: comboButton, signalName: 'onTriggered'},
40 ];
41 }
42 function test_trigger_via_keyboard(data) {

Subscribers

People subscribed via source and target branches