git.iko.soy/unity8
on xenial help sign in
Updated menu colors
4347bb5Nick Dedekind
qml/ApplicationMenus/MenuBar.qml+2−2
compare with xenial
unifiedsplit
@@ -208,7 +208,7 @@ Item {
208 id: _title
208 id: _title
209 text: actionItem.text
209 text: actionItem.text
210 horizontalAlignment: Text.AlignLeft
210 horizontalAlignment: Text.AlignLeft
211− color: enabled ? "white" : "#5d5d5d"
211+ color: enabled ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
212 }
212 }
213 }
213 }
214 }
214 }
@@ -280,7 +280,7 @@ Item {
280 width: units.gu(2)
280 width: units.gu(2)
281 height: units.gu(2)
281 height: units.gu(2)
282 anchors.centerIn: parent
282 anchors.centerIn: parent
283− color: theme.palette.normal.overlayText
283+ color: theme.palette.normal.backgroundText
284 name: "toolkit_chevron-down_2gu"
284 name: "toolkit_chevron-down_2gu"
285 }
285 }
286
286
qml/ApplicationMenus/MenuItem.qml+5−4
@@ -113,6 +113,7 @@ ActionItem {
113 elide: Text.ElideNone
113 elide: Text.ElideNone
114 wrapMode: Text.NoWrap
114 wrapMode: Text.NoWrap
115 clip: true
115 clip: true
116+ color: enabled ? theme.palette.normal.overlayText : theme.palette.disabled.overlayText
116 Layout.fillWidth: true
117 Layout.fillWidth: true
117
118
118 text: root.text ? root.text : ""
119 text: root.text ? root.text : ""
@@ -123,8 +124,8 @@ ActionItem {
123 elide: Text.ElideNone
124 elide: Text.ElideNone
124 wrapMode: Text.NoWrap
125 wrapMode: Text.NoWrap
125 clip: true
126 clip: true
126− color: enabled ? theme.palette.normal.backgroundSecondaryText :
127+ color: enabled ? theme.palette.normal.overlaySecondaryText :
127− theme.palette.disabled.backgroundSecondaryText
128+ theme.palette.disabled.overlaySecondaryText
128
129
129 visible: menuData.shortcut != undefined && !root.hasSubmenu && QuickUtils.keyboardAttached
130 visible: menuData.shortcut != undefined && !root.hasSubmenu && QuickUtils.keyboardAttached
130 text: menuData.shortcut ? menuData.shortcut : ""
131 text: menuData.shortcut ? menuData.shortcut : ""
@@ -135,8 +136,8 @@ ActionItem {
135 id: chevronIcon
136 id: chevronIcon
136 width: units.gu(2)
137 width: units.gu(2)
137 height: units.gu(2)
138 height: units.gu(2)
138− color: enabled ? theme.palette.normal.backgroundSecondaryText :
139+ color: enabled ? theme.palette.normal.overlayText :
139− theme.palette.disabled.backgroundSecondaryText
140+ theme.palette.disabled.overlayText
140
141
141 visible: root.hasSubmenu
142 visible: root.hasSubmenu
142 name: "toolkit_chevron-ltr_2gu"
143 name: "toolkit_chevron-ltr_2gu"
qml/Panel/Panel.qml+1−1
@@ -285,7 +285,7 @@ Item {
285 anchors.centerIn: parent
285 anchors.centerIn: parent
286 text: actionItem.text
286 text: actionItem.text
287 horizontalAlignment: Text.AlignLeft
287 horizontalAlignment: Text.AlignLeft
288− color: enabled ? "white" : "#5d5d5d"
288+ color: enabled ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
289 }
289 }
290 }
290 }
291
291
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+1−1
@@ -56,7 +56,7 @@ Item {
56 }
56 }
57 height: units.gu(3)
57 height: units.gu(3)
58 width: parent.width * 2/3
58 width: parent.width * 2/3
59− color: "grey"
59+ color: theme.palette.normal.background
60
60
61 MenuBar {
61 MenuBar {
62 id: menuBar
62 id: menuBar