Merge lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors into lp:ubuntu-ui-toolkit/staging
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors |
| Merge into: | lp:ubuntu-ui-toolkit/staging |
| Diff against target: |
642 lines (+272/-26) 16 files modified
components.api (+5/-0) src/Ubuntu/Components/1.3/PageHeader.qml (+6/-0) src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml (+23/-1) src/Ubuntu/Components/Styles/1.3/IconButtonProperties.qml (+10/-0) src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml (+5/-0) src/Ubuntu/Components/Styles/Styles.pro (+1/-0) src/Ubuntu/Components/Styles/qmldir (+1/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml (+30/-2) src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+9/-2) src/Ubuntu/UbuntuToolkit/ucstylehints.cpp (+6/-3) tests/unit/subtheming/GroupPropertyValueHints.qml (+33/-0) tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml (+30/-0) tests/unit/subtheming/subtheming.pro (+2/-0) tests/unit/subtheming/tst_subtheming.cpp (+7/-1) tests/unit/visual/tst_actionbar.13.qml (+75/-17) tests/unit/visual/tst_pageheader.13.qml (+29/-0) |
| To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Needs Fixing on 2016-07-13 | |
| Christian Dywan | 2016-07-04 | Needs Information on 2016-07-04 | |
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-07-14.
Commit Message
Configure ActionBar colors through its Style.
Added the following properties to ActionBarStyle:
- foregroundColor
- disabledForegro
- backgroundColor (background color of the full ActionBar)
- pressedBackgrou
Also added the following missing property to the existing color properties in PageHeaderStyle:
- pressedBackgrou
Description of the Change
Added the following properties to ActionBarStyle:
- foregroundColor
- disabledForegro
- backgroundColor (background color of the full ActionBar)
- pressedBackgrou
Also added the following missing property to PageHeaderStyle:
- pressedBackgrou
The other properties were already available in PageHeaderStyle.
It was already possible to control the icon colors somewhat by overriding the default delegate for the icon buttons in the ActionBar, but the new way is more convenient and 'cleaner'.
The Toolbar also makes use of ActionBar, but it still works as it is without changes, and ToolbarStyle will be completely replaced in my next MR so I did not make the color configuration available there yet.
tst_pageheader.
- 2033. By Tim Peeters on 2016-07-04
-
update components.api
- 2034. By Tim Peeters on 2016-07-04
-
clean
- 2035. By Tim Peeters on 2016-07-04
-
clean
FAILED: Continuous integration, rev:2033
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2033
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2033
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2033
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2035
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2035
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2035
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2035
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2035
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Christian Dywan (kalikiana) wrote : | # |
> - backgroundColor (background color of the full ActionBar)
> - pressedBackgrou
That seems shaky. Two times a background color value, but applied to either the bar as a whole or individual buttons. You can't know from the name - ActionBarStyle even uses the backgroundColor for both the buttons and the whole bar, is this intentional? {pressedB,
- 2036. By Tim Peeters on 2016-07-04
-
rename pressedBackgrou
ndColor property to pressedButtonBa ckgroundColor
| Tim Peeters (tpeeters) wrote : | # |
Ok, updated. Now there is a backgroundColor and pressedButtonBa
The background color is indeed used for the whole ActionBar/
FAILED: Continuous integration, rev:2036
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2036
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2036
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2036
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2036
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2037. By Tim Peeters on 2016-07-07
-
fix anchor
- 2038. By Tim Peeters on 2016-07-07
-
sync staging
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2039. By Tim Peeters on 2016-07-13
-
sync staging
- 2040. By Tim Peeters on 2016-07-13
-
test grouped property
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2041. By Tim Peeters on 2016-07-14
-
clean
- 2042. By Tim Peeters on 2016-07-14
-
sync fixGroupedStyle
Properties - 2043. By Tim Peeters on 2016-07-14
-
buttons color properties
- 2044. By Tim Peeters on 2016-07-14
-
update components.api
- 2045. By Tim Peeters on 2016-07-14
-
clean test; make delegate a proper Component
- 2046. By Tim Peeters on 2016-07-14
-
rename IconButtonPrope
rties to ButtonProperties - 2047. By Tim Peeters on 2016-07-14
-
document and clean
- 2048. By Tim Peeters on 2016-07-14
-
add ButtonProperties to PageHeaderStyle
- 2049. By Tim Peeters on 2016-07-14
-
rename ButtonProperties to ActionItemPrope
rties - 2050. By Tim Peeters on 2016-07-14
-
update components.api
- 2051. By Tim Peeters on 2016-07-14
-
fix coloring of ActionBars in PageHeader
- 2052. By Tim Peeters on 2016-07-15
-
sync fixGroupedStyle
Properties - 2053. By Tim Peeters on 2016-07-18
-
sync staging
- 2054. By Tim Peeters on 2016-07-19
-
use older QtQuick.Layouts in actionbar unit test
FAILED: Continuous integration, rev:2033
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/