1
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
2
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2013-07-12 06:02:43 +0000
3
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-03-24 12:20:10 +0000
4
@@ -51,11 +51,17 @@
5
51
51
6
52
    QtObject {
52
    QtObject {
7
53
        id: internals
53
        id: internals
8
54
        property bool isLight: ColorUtils.luminance(styledItem.backgroundColor) >= 0.85
9
55
        property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
54
        property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
10
56
                                  styledItem.backgroundColor != styledItem.footerColor
55
                                  styledItem.backgroundColor != styledItem.footerColor
13
57
        property string theme: isLight ? "Ambiance" :
56
        /*
14
58
                              (isGradient ? "SuruGradient" : "SuruDark")
57
          As we don't know the order the property bindings and onXXXChanged signals are evaluated
15
58
          we should rely only on one property when changing the theme to avoid intermediate
16
59
          theme changes due to properties being evaluated separately.
17
60
18
61
          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
19
62
          */
20
63
        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
21
64
                                (isGradient ? "SuruGradient" : "SuruDark")
22
59
    }
65
    }
23
60
66
24
61
    // automatically select the appropriate theme depending on the background colors
67
    // automatically select the appropriate theme depending on the background colors
25
@@ -63,5 +69,6 @@
26
63
        target: Theme
69
        target: Theme
27
64
        property: "name"
70
        property: "name"
28
65
        value: "Ubuntu.Components.Themes.%1".arg(internals.theme)
71
        value: "Ubuntu.Components.Themes.%1".arg(internals.theme)
29
72
        when: internals.theme !== ""
30
66
    }
73
    }
31
67
}
74
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-03-24
Tim Peeters		2014-02-07	Approve on 2014-03-12
Florian Boucault (community)			Approve on 2014-02-20
Review via email: mp+205407@code.launchpad.net