Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors into lp:ubuntu-ui-toolkit/staging

ActionBar-colors
Merge into staging

Proposed by Tim Peeters on 2016-07-04

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

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Needs Fixing on 2016-07-13
Cris Dywan		2016-07-04	Needs Information on 2016-07-04
Review via email: mp+299052@code.launchpad.net

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
- disabledForegroundColor (for icons with action.enabled == false)
- backgroundColor (background color of the full ActionBar)
- pressedBackgroundColor (background color of the button when pressed)

Also added the following missing property to the existing color properties in PageHeaderStyle:
- pressedBackgroundColor

Description of the change

Also added the following missing property to PageHeaderStyle:
- pressedBackgroundColor

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.13.qml was updated with a switch that changes the header colors for manual validation.

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-04

2033. By Tim Peeters on 2016-07-04: update components.api

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2033
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1004/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4250/console

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-04

2034. By Tim Peeters on 2016-07-04: clean
2035. By Tim Peeters on 2016-07-04: clean

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2033
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1028/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4251/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2033
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/783/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4252/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/783/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

PASSED: Continuous integration, rev:2033
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/809/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4253/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2035
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1029/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4255/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

PASSED: Continuous integration, rev:2035
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/810/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4256/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2035
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/784/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4257/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/784/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

PASSED: Continuous integration, rev:2035
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1005/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4258/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-07-04:

> - backgroundColor (background color of the full ActionBar)
> - pressedBackgroundColor (background color of the button when pressed)
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,b}uttonBackgroundColor" would be clearer.

review: Needs Information

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-04

2036. By Tim Peeters on 2016-07-04: rename pressedBackgroundColor property to pressedButtonBackgroundColor

Revision history for this message

Tim Peeters (tpeeters) wrote on 2016-07-04:

Ok, updated. Now there is a backgroundColor and pressedButtonBackgroundColor.

The background color is indeed used for the whole ActionBar/PageHeader, so when the button is not pressed, it does not need (or have) a background color. When you pressed the button its color is set to pressedButtonBackgroundColor.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2036
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1032/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4269/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

PASSED: Continuous integration, rev:2036
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/813/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4270/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

FAILED: Continuous integration, rev:2036
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/787/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4271/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/787/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

PASSED: Continuous integration, rev:2036
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1008/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4272/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-04:

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-07

2037. By Tim Peeters on 2016-07-07: fix anchor
2038. By Tim Peeters on 2016-07-07: sync staging

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-07:

FAILED: Continuous integration, rev:2038
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1038/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4300/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-07:

PASSED: Continuous integration, rev:2038
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/819/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4301/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-07:

FAILED: Continuous integration, rev:2038
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/793/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4302/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/793/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-07:

PASSED: Continuous integration, rev:2038
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1014/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4303/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-07:

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-13

2039. By Tim Peeters on 2016-07-13: sync staging
2040. By Tim Peeters on 2016-07-13: test grouped property

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-13:

FAILED: Continuous integration, rev:2039
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1053/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4371/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-13:

PASSED: Continuous integration, rev:2039
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/834/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4372/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-13:

PASSED: Continuous integration, rev:2039
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1029/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4373/console

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

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-13:

FAILED: Continuous integration, rev:2039
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/808/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4374/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/808/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-07-13:

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/ActionBar-colors updated on 2016-07-19

2041. By Tim Peeters on 2016-07-14: clean
2042. By Tim Peeters on 2016-07-14: sync fixGroupedStyleProperties
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 IconButtonProperties 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 ActionItemProperties
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 fixGroupedStyleProperties
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

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tim Peeters

Tom Mirmar

Ubuntu SDK team

 === modified file 'components.api'
 --- components.api	2016-07-04 16:14:54 +0000
 +++ components.api	2016-07-14 09:52:55 +0000
@@ -36,11 +36,15 @@
      property Component delegate
      property int numberOfSlots
  Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
++    property color backgroundColor
      property Component defaultDelegate
      property int defaultNumberOfSlots
++    property color disabledForegroundColor
++    property color foregroundColor
      property string overflowIconName
      property url overflowIconSource
      property string overflowText
++    property color pressedButtonBackgroundColor
  Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject
      default property list<Action> actions
      property bool active
@@ -837,6 +841,7 @@
      property color disabledForegroundColor
      property color dividerColor
      property color foregroundColor
++    property color pressedButtonBackgroundColor
      property color subtitleColor
      property Component subtitleComponent
      property Component titleComponent
 === modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
 --- src/Ubuntu/Components/1.3/PageHeader.qml	2016-06-14 14:37:54 +0000
 +++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-07-14 09:52:55 +0000
@@ -227,6 +227,12 @@
          numberOfSlots: MathUtils.clamp(0.3*header.width/units.gu(4), 3, 6)
          delegate: header.__styleInstance.defaultActionDelegate
          visible: trailing.width > 0 // at least 1 visible action
++        StyleHints {
++            foregroundColor: header.__styleInstance.foregroundColor
++            disabledForegroundColor: header.__styleInstance.disabledForegroundColor
++            backgroundColor: header.__styleInstance.backgroundColor
++            pressedBackgroundColor: header.__styleInstance.pressedBackgroundColor
++        }
+     }
      /*!
 === modified file 'src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml'
 --- src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml	2015-10-15 14:17:25 +0000
 +++ src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml	2016-07-14 09:52:55 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2015 Canonical Ltd.
++ * Copyright 2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -25,6 +25,28 @@
    */
  Item {
      /*!
++      The color of the action buttons in the action bar.
++     */
++//    property color foregroundColor
++
++    /*!
++      The color of disabled action buttons in the action bar.
++     */
++//    property color disabledForegroundColor
++
++    /*!
++      The color of the background of the action bar.
++     */
++    property color backgroundColor
++
++    readonly property IconButtonProperties buttons: IconButtonProperties { }
++
++    /*!
++      The color of the background of a pressed button in the action bar.
++     */
++//    property color pressedButtonBackgroundColor
++
++    /*!
        The default action delegate if the styled item does
        not provide a different delegate.
       */
 === added file 'src/Ubuntu/Components/Styles/1.3/IconButtonProperties.qml'
 --- src/Ubuntu/Components/Styles/1.3/IconButtonProperties.qml	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/Components/Styles/1.3/IconButtonProperties.qml	2016-07-14 09:52:55 +0000
@@ -0,0 +1,10 @@
++import QtQuick 2.4
++
++QtObject {
++    property color foregroundColor
++    property color disabledForegroundColor
++    property color pressedForegroundColor
++    property color backgroundColor
++    property color disabledBackgroundColor
++    property color pressedBackgroundColor
++}
 === modified file 'src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml'
 --- src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2016-03-30 15:12:36 +0000
 +++ src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2016-07-14 09:52:55 +0000
@@ -45,6 +45,11 @@
      property color backgroundColor
      /*!
++      The color of the background of a pressed button header.
++     */
++    property color pressedButtonBackgroundColor
++
++    /*!
        The color of the divider at the bottom of the header.
       */
      property color dividerColor
 === modified file 'src/Ubuntu/Components/Styles/Styles.pro'
 --- src/Ubuntu/Components/Styles/Styles.pro	2016-06-23 09:13:51 +0000
 +++ src/Ubuntu/Components/Styles/Styles.pro	2016-07-14 09:52:55 +0000
@@ -13,6 +13,7 @@
 .3/PageHeaderStyle.qml \
 .3/ToolbarStyle.qml \
 .3/SectionsStyle.qml \
++	     1.3/IconButtonProperties.qml \
  load(ubuntu_qml_plugin)
 === modified file 'src/Ubuntu/Components/Styles/qmldir'
 --- src/Ubuntu/Components/Styles/qmldir	2016-06-23 09:13:51 +0000
 +++ src/Ubuntu/Components/Styles/qmldir	2016-07-14 09:52:55 +0000
@@ -12,3 +12,4 @@
  PageHeaderStyle 1.3 1.3/PageHeaderStyle.qml
  ToolbarStyle 1.3 1.3/ToolbarStyle.qml
  SectionsStyle 1.3 1.3/SectionsStyle.qml
++IconButtonProperties 1.3 1.3/IconButtonProperties.qml
 === modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
 --- src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-12-09 21:41:45 +0000
 +++ src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2016-07-14 09:52:55 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2015 Canonical Ltd.
++ * Copyright 2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -28,12 +28,34 @@
      // Unused with the standard action icon buttons, but may be used with a custom delegate.
      overflowText: "More"
++    backgroundColor: theme.palette.normal.background
++    buttons {
++        foregroundColor: theme.palette.normal.backgroundText
++        pressedForegroundColor: buttons.foregroundColor
++        disabledForegroundColor: theme.palette.disabled.backgroundText
++        backgroundColor: "transparent" // background is already colored
++        pressedBackgroundColor: theme.palette.highlighted.background
++        disabledBackgroundColor: buttons.backgroundColor
++    }
++
      /*!
        The default action delegate if the styled item does
        not provide a delegate.
       */
      defaultDelegate: AbstractButton {
--        style: IconButtonStyle { }
++        id: button
++        style: IconButtonStyle {
++            foregroundColor: button.pressed ?
++                                 actionBarStyle.buttons.pressedForegroundColor :
++                                 button.enabled ?
++                                     actionBarStyle.buttons.foregroundColor :
++                                     actionBarStyle.buttons.disabledForegroundColor
++            backgroundColor: button.pressed ?
++                                 actionBarStyle.buttons.pressedBackgroundColor :
++                                 button.enabled ?
++                                     actionBarStyle.buttons.backgroundColor :
++                                     actionBarStyle.buttons.disabledBackgroundColor
++        }
          objectName: action.objectName + "_button"
          height: parent ? parent.height : undefined
          action: modelData
@@ -41,6 +63,12 @@
      defaultNumberOfSlots: 3
++    Rectangle {
++        id: background
++        anchors.fill: parent
++        color: actionBarStyle.backgroundColor
++    }
++
      Component {
          id: fadeInComponent
          SequentialAnimation {
 === modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
 --- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-06-14 14:37:54 +0000
 +++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-07-14 09:52:55 +0000
@@ -25,6 +25,7 @@
      disabledForegroundColor: theme.palette.disabled.backgroundText
      subtitleColor: theme.palette.normal.backgroundTertiaryText
      backgroundColor: theme.palette.normal.background
++    pressedButtonBackgroundColor: theme.palette.highlighted.background
      dividerColor: theme.palette.normal.base
      // Font weight for the title and subtitle
@@ -84,13 +85,19 @@
+     }
      defaultActionDelegate: AbstractButton {
++        id: button
          style: IconButtonStyle { }
          objectName: action.objectName + "_button"
          height: internal.titleAreaHeight
          action: modelData
          StyleHints {
--            foregroundColor: enabled ? pageHeaderStyle.foregroundColor
--                                     : pageHeaderStyle.disabledForegroundColor
++            foregroundColor: button.enabled
++                             ? pageHeaderStyle.foregroundColor
++                             : pageHeaderStyle.disabledForegroundColor
++            backgroundColor: button.pressed
++                             ? pageHeaderStyle.pressedButtonBackgroundColor
++                             : "transparent" // background is already colored
++
+         }
+     }
 === modified file 'src/Ubuntu/UbuntuToolkit/ucstylehints.cpp'
 --- src/Ubuntu/UbuntuToolkit/ucstylehints.cpp	2016-07-07 07:21:48 +0000
 +++ src/Ubuntu/UbuntuToolkit/ucstylehints.cpp	2016-07-14 09:52:55 +0000
@@ -225,15 +225,18 @@
      m_propertyBackup.clear();
      QQuickItem *item = UCStyledItemBasePrivate::get(m_styledItem)->styleItem;
--    const QMetaObject *mo = item->metaObject();
      const QString styleName = UCStyledItemBasePrivate::get(m_styledItem)->styleName();
      // apply values first
      for (int i = 0; i < m_values.size(); i++) {
--        if (mo->indexOfProperty(m_values[i].first.toUtf8()) < 0) {
++        // Checking the validity of the property using the index of m_values[i].first in
++        //  item->metaObject is not sufficient in case of a grouped property, so we use
++        //  PropertyChange to detect all properties that are not valid.
++        PropertyChange *change = new PropertyChange(item, m_values[i].first.toUtf8());
++        if (!change->property().isValid()) {
              propertyNotFound(styleName, m_values[i].first);
++            delete change;
              continue;
+         }
--        PropertyChange *change = new PropertyChange(item, m_values[i].first.toUtf8());
          PropertyChange::setValue(change, m_values[i].second);
          m_propertyBackup << change;
+     }
 === added file 'tests/unit/subtheming/GroupPropertyValueHints.qml'
 --- tests/unit/subtheming/GroupPropertyValueHints.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit/subtheming/GroupPropertyValueHints.qml	2016-07-14 09:52:55 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++Item {
++    width: units.gu(40)
++    height: units.gu(71)
++
++    HintedButton {
++        objectName: "Button"
++        id: button
++        gradient: UbuntuColors.greyGradient
++        StyleHints {
++            ignoreUnknownProperties: false
++            gradientProxy.topColor: "orange"
++        }
++    }
++}
 === added file 'tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml'
 --- tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml	2016-07-14 09:52:55 +0000
@@ -0,0 +1,30 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++Item {
++    width: units.gu(40)
++    height: units.gu(71)
++
++    Button {
++        StyleHints {
++            ignoreUnknownProperties: false
++            gradientProxy.invalidProperty: 10
++        }
++    }
++}
 === modified file 'tests/unit/subtheming/subtheming.pro'
 --- tests/unit/subtheming/subtheming.pro	2016-05-31 09:02:35 +0000
 +++ tests/unit/subtheming/subtheming.pro	2016-07-14 09:52:55 +0000
@@ -37,9 +37,11 @@
      StyleHintsWithObject.qml \
      StyleHintsElsewhere.qml \
      StyleHintsInvalidProperty.qml \
++    StyleHintsInvalidGroupedProperty.qml \
      PropertyBindingHints.qml \
      MoreStyleHints.qml \
      GroupPropertyBindingHints.qml \
++    GroupPropertyValueHints.qml \
      OverrideStyleHints.qml \
      HintedButton.qml \
      OtherVersion.qml \
 === modified file 'tests/unit/subtheming/tst_subtheming.cpp'
 --- tests/unit/subtheming/tst_subtheming.cpp	2016-07-07 15:33:34 +0000
 +++ tests/unit/subtheming/tst_subtheming.cpp	2016-07-14 09:52:55 +0000
@@ -827,6 +827,9 @@
                  << "StyleHintsElsewhere.qml" << 24 << 5 << "QML StyleHints: StyleHints must be declared in a StyledItem or a derivate of it.";
          QTest::newRow("Invalid property")
                  << "StyleHintsInvalidProperty.qml" << 25 << 9 << "QML StyleHints: Style 'ButtonStyle' has no property called 'invalidProperty'.";
++        QTest::newRow("Invalid grouped property")
++                << "StyleHintsInvalidGroupedProperty.qml" << 25 << 9 << "QML StyleHints: Style 'ButtonStyle' has no property called 'gradientProxy.invalidProperty'.";
++
+     }
      void test_stylehints_errors()
+     {
@@ -877,8 +880,11 @@
          QTest::newRow("Same document")
                  << "MoreStyleHints.qml" << "defaultColor" << QColor("brown") << QColor("brown") << "minimumWidth" << units.gu(20);
--        QTest::newRow("Different document")
++        QTest::newRow("Different document, binding")
                  << "GroupPropertyBindingHints.qml" << "gradientProxy.topColor" << QColor("blue") << QColor("tan") << "minimumWidth" << units.gu(20);
++        // regression test for bug #1602836.
++        QTest::newRow("Different document, value")
++                << "GroupPropertyValueHints.qml" << "gradientProxy.topColor" << QColor("orange") << QColor("orange") << "minimumWidth" << units.gu(20);
+     }
      void test_stylehints_multiple()
+     {
 === modified file 'tests/unit/visual/tst_actionbar.13.qml'
 --- tests/unit/visual/tst_actionbar.13.qml	2016-06-15 13:46:51 +0000
 +++ tests/unit/visual/tst_actionbar.13.qml	2016-07-14 09:52:55 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2015 Canonical Ltd.
++ * Copyright 2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -15,38 +15,71 @@
   */
  import QtQuick 2.4
++import QtQuick.Layouts 1.2
  import Ubuntu.Test 1.0
  import Ubuntu.Components 1.3
  Item {
      id: root
--    width: 400
--    height: 600
++    width: units.gu(50)
++    height: units.gu(60)
      property list<Action> actionList:  [
          Action {
              iconName: "alarm-clock"
              text: "Tick tock"
++            onTriggered: print("tock")
          },
          Action {
              iconName: "appointment"
              text: "Date"
++            onTriggered: print("date")
          },
          Action {
              iconName: "attachment"
              text: "Attach"
++            onTriggered: print("attach")
          },
          Action {
              iconName: "contact"
              text: "Contact"
++            onTriggered: print("contact")
          },
          Action {
              iconName: "like"
              text: "Like"
++            onTriggered: print("+1")
          },
          Action {
              iconName: "lock"
              text: "Lock"
++            onTriggered: print("lock")
++        },
++        Action {
++            iconName: "camcorder"
++            text: "Camera"
++            onTriggered: print("cam")
++        },
++        Action {
++            iconName: "location"
++            text: "Location"
++            onTriggered: print("loc")
++            enabled: false
++        },
++        Action {
++            iconName: "message"
++            text: "Message"
++            onTriggered: print("msg")
++        },
++        Action {
++            iconName: "livetv"
++            text: "Television"
++            onTriggered: print("tv")
++        },
++        Action {
++            iconName: "lock-broken"
++            text: "Unlock"
++            onTriggered: print("unlock")
+         }
+     ]
@@ -54,10 +87,12 @@
          Action {
              iconName: "share"
              text: "Share"
++            onTriggered: print("share")
          },
          Action {
              iconName: "starred"
              text: "Favorite"
++            onTriggered: print("fav")
+         }
+     ]
@@ -70,13 +105,12 @@
+         }
          height: childrenRect.height
--        Item {
++        RowLayout {
              width: parent.width
              height: childrenRect.height
              Label {
                  anchors {
--                    left: parent.left
                      verticalCenter: shortBar.verticalCenter
+                 }
                  text: "" + shortBar.numberOfSlots + " slot(s):"
@@ -85,18 +119,17 @@
              ActionBar {
                  // no numberOfSlots specified. Using default value.
                  id: shortBar
--                anchors.right: parent.right
++                Layout.fillWidth: true
                  actions: root.shortActionList
+             }
+         }
--        Item {
++        RowLayout {
              width: parent.width
              height: childrenRect.height
              Label {
                  anchors {
--                    left: parent.left
                      verticalCenter: bar.verticalCenter
+                 }
                  text: "" + bar.numberOfSlots + " slot(s):"
@@ -104,9 +137,33 @@
              ActionBar {
                  id: bar
--                anchors.right: parent.right
--                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
--                actions: root.actionList
++                Layout.fillWidth: true
++                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
++                actions: root.actionList
++            }
++        }
++
++        RowLayout {
++            width: parent.width
++            height: childrenRect.height
++            Label {
++                anchors {
++                    verticalCenter: coloredBar.verticalCenter
++                }
++                text: "colored:"
++            }
++            ActionBar {
++                id: coloredBar
++                Layout.fillWidth: true
++                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
++                actions: root.actionList
++                StyleHints {
++                    ignoreUnknownProperties: false
++//                    foregroundColor: "white"
++                    backgroundColor: UbuntuColors.blue
++//                    defaultButton.backgroundColor: "yellow"
++                    buttons.pressedBackgroundColor: "black"
++                }
+             }
+         }
@@ -122,20 +179,19 @@
              live: true
+         }
--        Item {
++        RowLayout {
              width: parent.width
              height: childrenRect.height
              Label {
                  anchors {
--                    left: parent.left
                      verticalCenter: customDelegateBar.verticalCenter
+                 }
                  text: "Custom delegate"
+             }
              ActionBar {
                  id: customDelegateBar
--                anchors.right: parent.right
++                Layout.fillWidth: true
                  actions: root.shortActionList
                  delegate: Button {
                      action: modelData
@@ -146,23 +202,25 @@
+             }
+         }
--        Item {
++        RowLayout {
              width: parent.width
              height: childrenRect.height
              Label {
                  anchors {
--                    left: parent.left
                      verticalCenter: greenButtonsBar.verticalCenter
+                 }
                  text: "Custom delegate 2"
+             }
              ActionBar {
++                // Note: The same result (green buttons) can be accomplished
++                //  by setting the foregroundColor in the style.
                  id: greenButtonsBar
--                anchors.right: parent.right
++                Layout.fillWidth: true
                  actions: root.actionList
                  delegate: AbstractButton {
                      styleName: "IconButtonStyle"
                      action: modelData
++                    height: greenButtonsBar.height
                      StyleHints {
                          foregroundColor: UbuntuColors.green
+                     }
 === modified file 'tests/unit/visual/tst_pageheader.13.qml'
 --- tests/unit/visual/tst_pageheader.13.qml	2016-06-15 13:46:51 +0000
 +++ tests/unit/visual/tst_pageheader.13.qml	2016-07-14 09:52:55 +0000
@@ -139,6 +139,27 @@
              navigationActions: leadingActionsSwitch.checked ?
                                            root.actionList : []
              extension: extensionSwitch.checked ? appendix : null
++
++            StyleHints {
++                foregroundColor: customColorsSwitch.checked
++                                 ? "white"
++                                 : theme.palette.normal.backgroundText
++                disabledForegroundColor: customColorsSwitch.checked
++                                         ? "black"
++                                         : theme.palette.disabled.backgroundText
++                subtitleColor: customColorsSwitch.checked
++                               ? UbuntuColors.red
++                               : theme.palette.normal.backgroundTertiaryText
++                backgroundColor: customColorsSwitch.checked
++                                 ? UbuntuColors.blue
++                                 : theme.palette.normal.background
++                pressedButtonBackgroundColor: customColorsSwitch.checked
++                                              ? UbuntuColors.green
++                                              : theme.palette.highlighted.background
++                dividerColor: customColorsSwitch.checked
++                              ? UbuntuColors.red
++                              : theme.palette.normal.base
++            }
+         }
          Flickable {
@@ -244,6 +265,14 @@
                  Label {
                      text: "subtitle"
+                 }
++
++                Switch {
++                    id: customColorsSwitch
++                    checked: false
++                }
++                Label {
++                    text: "custom colors"
++                }
+             }
              PageHeader {