git.iko.soy/unity8
on xenial help sign in
MenuItemFactory: use same rules for fake indicators
935914bMarco Trevisan (Treviño)
qml/Panel/Indicators/MenuItemFactory.qml+4−2
compare with xenial
unifiedsplit
@@ -255,14 +255,13 @@ Item {
255
255
256 text: menuData && menuData.label || ""
256 text: menuData && menuData.label || ""
257 enabled: menuData && menuData.sensitive || false
257 enabled: menuData && menuData.sensitive || false
258+ backColor: Qt.rgba(1,1,1,0.07)
258 highlightWhenPressed: false
259 highlightWhenPressed: false
259
260
260 onTriggered: {
261 onTriggered: {
261 menuModel.activate(menuIndex);
262 menuModel.activate(menuIndex);
262 }
263 }
263
264
264− backColor: Qt.rgba(1,1,1,0.07)
265−
266 slots: Icon {
265 slots: Icon {
267 source: {
266 source: {
268 if (menuData) {
267 if (menuData) {
@@ -1014,6 +1013,9 @@ Item {
1014 }
1013 }
1015
1014
1016 function load(modelData, context) {
1015 function load(modelData, context) {
1016+ if (context.indexOf("fake-") == 0)
1017+ context = context.substring("fake-".length)
1018+
1017 // tweak indicator-session items
1019 // tweak indicator-session items
1018 if (context === "indicator-session") {
1020 if (context === "indicator-session") {
1019 if ((modelData.action === "indicator.logout" || modelData.action === "indicator.suspend" || modelData.action === "indicator.hibernate" ||
1021 if ((modelData.action === "indicator.logout" || modelData.action === "indicator.suspend" || modelData.action === "indicator.hibernate" ||