@@ -48,7 +48,7 @@ ActionItem {
4848 action: Action {
4949 text: menuData.label.replace("_", "&")
5050 checkable: menuData.isCheck || menuData.isRadio
51− // TODO - exclusive groups.
51+ checked: menuData.isToggled
5252 }
5353
5454 width: {
@@ -59,14 +59,16 @@ ActionItem {
5959
6060 Keys.onRightPressed: {
6161 if (hasSubmenu) {
62− root.trigger(action && action.checkable ? !action.checked : undefined);
62+ root.trigger();
6363 } else {
6464 event.accepted = false;
6565 }
6666 }
67+ Keys.onReturnPressed: {
68+ root.trigger();
69+ }
6770 Keys.onEnterPressed: {
68− root.trigger(action && action.checkable ? !action.checked : undefined);
69− event.accepted = true;
71+ root.trigger();
7072 }
7173
7274 RowLayout {
@@ -78,12 +80,17 @@ ActionItem {
7880 anchors.rightMargin: units.gu(1)
7981 anchors.verticalCenter: parent.verticalCenter
8082
81− Icon {
82− id: flagGutter
83− width: units.gu(1.5)
84− height: units.gu(1.5)
83+ Item {
84+ Layout.minimumWidth: units.gu(1.5)
85+ Layout.minimumHeight: units.gu(1.5)
8586
86− name: _checked ? "tick" : ""
87+ Icon {
88+ id: flagGutter
89+ width: units.gu(1.5)
90+ height: units.gu(1.5)
91+ visible: _checked
92+ name: "tick"
93+ }
8794 }
8895
8996 Icon {