1
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
2
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-05-25 12:48:10 +0000
3
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-06-09 10:38:15 +0000
4
@@ -827,6 +827,9 @@
5
827
                property color panelColor: layout.__propagated.header.panelColor
827
                property color panelColor: layout.__propagated.header.panelColor
6
828
                property color backgroundColor: layout.__propagated.header.backgroundColor
828
                property color backgroundColor: layout.__propagated.header.backgroundColor
7
829
829
8
830
                // Enable red outline in the PageHeadStyle. See bug #1583636.
9
831
                property bool showDeprecatedWarning: true
10
832
11
830
                visible: !customHeader && holder.pageWrapper && holder.pageWrapper.active
833
                visible: !customHeader && holder.pageWrapper && holder.pageWrapper.active
12
831
834
13
832
                // The multiColumn, page and showBackButton properties are used in
835
                // The multiColumn, page and showBackButton properties are used in
14
833
836
15
=== modified file 'src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml'
16
--- src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	2015-09-22 14:39:47 +0000
17
+++ src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	2016-06-09 10:38:15 +0000
18
@@ -17,6 +17,7 @@
19
17
17
20
18
/*!
18
/*!
21
19
    \qmltype PageHeadStyle
19
    \qmltype PageHeadStyle
22
20
    \deprecated
23
20
    \inqmlmodule Ubuntu.Components.Styles 1.1
21
    \inqmlmodule Ubuntu.Components.Styles 1.1
24
21
    \ingroup style-api
22
    \ingroup style-api
25
22
    \brief Style API for page header.
23
    \brief Style API for page header.
26
23
24
27
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
28
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-02-29 16:02:50 +0000
29
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-06-09 10:38:15 +0000
30
@@ -50,8 +50,18 @@
31
50
     */
50
     */
32
51
    property color backgroundColor: styledItem.backgroundColor
51
    property color backgroundColor: styledItem.backgroundColor
33
52
    Rectangle {
52
    Rectangle {
34
53
        id: background
35
53
        anchors.fill: parent
54
        anchors.fill: parent
36
54
        color: headerStyle.backgroundColor
55
        color: headerStyle.backgroundColor
37
56
38
57
        // The border is shown to warn the developer that the AppHeader
39
58
        //  is deprecated. See bug #1583636
40
59
        property bool showBorder: styledItem.hasOwnProperty("showDeprecatedWarning") &&
41
60
                                  styledItem.showDeprecatedWarning
42
61
        border {
43
62
            width: background.showBorder ? units.gu(0.5) : 0
44
63
            color: background.showBorder ? UbuntuColors.red : "transparent"
45
64
        }
46
55
    }
65
    }
47
56
66
48
57
    // FIXME: When the three panel color properties below are removed,
67
    // FIXME: When the three panel color properties below are removed,
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-09
Cris Dywan		2016-06-09	Approve on 2016-06-09
Review via email: mp+296919@code.launchpad.net