From 908faa13345797dd37102cf324f3aade3ba9f459 Mon Sep 17 00:00:00 2001
From: beholder <elderorb@gmail.com>
Date: Fri, 10 Nov 2017 19:38:07 +0300
Subject: [PATCH] refactoring: simplify code & fix the issue with menu-es
 sometimes losing checked state

---
 interface/resources/qml/desktop/Desktop.qml   | 24 +++++++++++--------
 .../qml/hifi/tablet/TabletMenuStack.qml       | 23 ------------------
 2 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 847111b8a0..e7c68b2a47 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -51,19 +51,23 @@ FocusScope {
 
     // The VR version of the primary menu
     property var rootMenu: Menu { 
+        id: rootMenuId
         objectName: "rootMenu" 
 
-        // for some reasons it is not possible to use just '({})' here as it gets empty when passed to TableRoot/DesktopRoot
-        property var exclusionGroupsByMenuItem : ListModel {}
+        property var exclusionGroups: ({});
+        property Component exclusiveGroupMaker: Component {
+            ExclusiveGroup {
+            }
+        }
 
-        function addExclusionGroup(menuItem, exclusionGroup)
-        {
-            exclusionGroupsByMenuItem.append(
-                {
-                    'menuItem' : menuItem.toString(), 
-                    'exclusionGroup' : exclusionGroup.toString()
-                }
-            );
+        function addExclusionGroup(qmlAction, exclusionGroup) {
+
+            var exclusionGroupId = exclusionGroup.toString();
+            if(!exclusionGroups[exclusionGroupId]) {
+                exclusionGroups[exclusionGroupId] = exclusiveGroupMaker.createObject(rootMenuId);
+            }
+
+            qmlAction.exclusiveGroup = exclusionGroups[exclusionGroupId]
         }
     }
 
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
index ce4fac3bd5..8cd696a41b 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
@@ -66,7 +66,6 @@ Item {
 
         function toModel(items, newMenu) {
             var result = modelMaker.createObject(tabletMenu);
-            var exclusionGroups = {};
 
             for (var i = 0; i < items.length; ++i) {
                 var item = items[i];
@@ -78,28 +77,6 @@ Item {
                     if (item.text !== "Users Online") {
                         result.append({"name": item.text, "item": item})
                     }
-
-                    for(var j = 0; j < tabletMenu.rootMenu.exclusionGroupsByMenuItem.count; ++j)
-                    {
-                        var entry = tabletMenu.rootMenu.exclusionGroupsByMenuItem.get(j);
-                        if(entry.menuItem == item.toString())
-                        {
-                            var exclusionGroupId = entry.exclusionGroup;
-                            console.debug('item exclusionGroupId: ', exclusionGroupId)
-
-                            if(!exclusionGroups[exclusionGroupId])
-                            {
-                                exclusionGroups[exclusionGroupId] = exclusiveGroupMaker.createObject(newMenu);
-                                console.debug('new exclusion group created: ', exclusionGroups[exclusionGroupId])
-                            }
-
-                            var exclusionGroup = exclusionGroups[exclusionGroupId];
-
-                            item.exclusiveGroup = exclusionGroup
-                            console.debug('item.exclusiveGroup: ', item.exclusiveGroup)                        
-                        }
-                    }
-
                     break;
                 case MenuItemType.Separator:
                     result.append({"name": "", "item": item})