Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheComboButton into lp:ubuntu-ui-toolkit/staging
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tim Peeters on 2016-07-26 | ||||
| Approved revision: | 2002 | ||||
| Merged at revision: | 2043 | ||||
| Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheComboButton | ||||
| Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
| Prerequisite: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheListItem | ||||
| Diff against target: |
264 lines (+59/-23) 7 files modified
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+8/-8) src/Ubuntu/Components/1.3/ComboButton.qml (+13/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+5/-1) src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp (+1/-1) src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h (+1/-1) tests/unit/visual/tst_combobutton.13.qml (+23/-10) tests/unit/visual/tst_focus.13.qml (+8/-2) |
||||
| To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/acceptTheComboButton | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve on 2016-07-26 | |
| Tim Peeters | 2016-05-23 | Approve on 2016-07-26 | |
|
Review via email:
|
|||
Commit Message
Enter/Return to trigger, Space to expand ComboButton
FAILED: Continuous integration, rev:1986
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1986
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1986
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1986
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 1987. By Christian Dywan on 2016-06-02
- 1988. By Christian Dywan on 2016-06-02
-
Tab focus in/ out test cases for ComboButton
FAILED: Continuous integration, rev:1988
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1988
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1988
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1988
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1988
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 1989. By Christian Dywan on 2016-06-03
-
Fix merging mistakes gone wrong unnoticed
- 1990. By Christian Dywan on 2016-06-03
-
Update unit test: panel becomes invisible rather than translucent
- 1991. By Christian Dywan on 2016-06-03
-
Add unit tests for ComboButton keys
FAILED: Continuous integration, rev:1991
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1991
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1991
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1991
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1991
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 1992. By Christian Dywan on 2016-06-14
- 1993. By Christian Dywan on 2016-06-16
- 1994. By Christian Dywan on 2016-06-16
-
Use tryCompare when checking combo height/ expansion
FAILED: Continuous integration, rev:1994
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1994
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1994
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1994
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1994
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 1995. By Christian Dywan on 2016-06-20
-
Alias activeFocusOnTab rather than unsetting it
Otherwise the component seemingly doesn't support focus.
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1995
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1996. By Christian Dywan on 2016-06-21
-
Add internal comment for ComboButton.
keyNavigationFo cus
FAILED: Continuous integration, rev:1996
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:1996
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:1996
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:1996
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1996
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 1997. By Christian Dywan on 2016-07-14
-
Use ListItem(WithLabel) for ComboButton's in the gallery
- 1998. By Christian Dywan on 2016-07-14
-
Put the ComboButton back in charge of its own keyNavigationFocus
- 1999. By Christian Dywan on 2016-07-14
-
AbstractButton shouldn't by default accept Tab
This is enabled in the styles that support focus. Invisible
(Shift)Tab movement out of the box is not useful. - 2000. By Christian Dywan on 2016-07-14
-
AbstractButton shouldn't act as a FocusScope
- 2001. By Christian Dywan on 2016-07-14
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2001
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 2002. By Christian Dywan on 2016-07-22
-
Fix dropdown button focussing the main item
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:1986
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/