git.iko.soy/unity8
on xenial help sign in
updated indicator model mock to fix warnings
13fa087Nick Dedekind
tests/mocks/Unity/Indicators/ModelActionRootState.qml+26−4
compare with xenial
unifiedsplit
@@ -33,17 +33,39 @@ Item {
33 property string submenuAction: {
33 property string submenuAction: {
34 if (!menu) return "";
34 if (!menu) return "";
35 var ext = menu.get(0, "ext");
35 var ext = menu.get(0, "ext");
36− var submenuVar = ext ? ext["submenu-action"] : undefined;
36+ var action = ext ? ext["submenu-action"] : undefined;
37− return submenuVar ? submenuVar : ""
37+ return action ? action : ""
38 }
38 }
39+
40+ property string secondaryAction: {
41+ if (!menu) return "";
42+ var ext = menu.get(0, "ext");
43+ var action = ext ? ext["x-canonical-secondary-action"] : undefined;
44+ return action ? action : ""
45+ }
46+
47+ property string scrollAction: {
48+ if (!menu) return "";
49+ var ext = menu.get(0, "ext");
50+ var action = ext ? ext["x-canonical-scroll-action"] : undefined;
51+ return action ? action : ""
52+ }
53+
39 Connections {
54 Connections {
40 target: menu
55 target: menu
41 onModelDataChanged: {
56 onModelDataChanged: {
42 cachedState = menu.get(0, "actionState");
57 cachedState = menu.get(0, "actionState");
43
58
44 var ext = menu.get(0, "ext");
59 var ext = menu.get(0, "ext");
60+
45− var submenuVar = ext ? ext["submenu-action"] : undefined;
61+ var action = ext ? ext["submenu-action"] : undefined;
46− submenuAction = submenuVar ? submenuVar : ""
62+ submenuAction = action ? action : ""
63+
64+ action = ext ? ext["x-canonical-secondary-action"] : undefined;
65+ secondaryAction = action ? action : ""
66+
67+ action = ext ? ext["x-canonical-scroll-action"] : undefined;
68+ scrollAction = action ? action : ""
47 }
69 }
48 }
70 }
49
71