← Back to branch summary

~mterry/+junk/u8

« back to all changes in this revision

Viewing changes to qml/Panel/IndicatorsMenu.qml

  • Committer: Daniel van Vugt
  • Date: 2016-03-29 03:47:39 UTC
  • mfrom: (2311 unity8)
  • mto: This revision was merged to the branch mainline in revision 2371.
  • Revision ID: daniel.van.vugt@canonical.com-20160329034739-747vgu4bv4dtt53v
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Panel/IndicatorsMenu.qml
36
36
    readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0
37
37
    readonly property bool fullyClosed: unitProgress == 0
38
38
    property bool enableHint: true
39
 
    property bool contentEnabled: true
40
39
    property bool showOnClick: true
41
 
    property color panelColor: UbuntuColors.jet
 
40
    property color panelColor: theme.palette.normal.background
42
41
 
43
42
    signal showTapped(point position)
44
43
 
76
75
    MenuContent {
77
76
        id: content
78
77
        objectName: "menuContent"
79
 
        color: root.panelColor
80
78
 
81
79
        anchors {
82
80
            left: parent.left
86
84
        height: openedHeight - bar.height - handle.height
87
85
        indicatorsModel: root.indicatorsModel
88
86
        visible: root.unitProgress > 0
89
 
        enabled: contentEnabled
90
87
        currentMenuIndex: bar.currentItemIndex
91
88
    }
92
89
 
111
108
            height: units.gu(0.5)
112
109
            gradient: Gradient {
113
110
                GradientStop { position: 0.0; color: "transparent" }
114
 
                GradientStop { position: 1.0; color: root.panelColor }
 
111
                GradientStop { position: 1.0; color: theme.palette.normal.background }
115
112
            }
116
113
            opacity: 0.3
117
114
        }