From 53f581c3d418a246809e019668361dc7a4601bc9 Mon Sep 17 00:00:00 2001
From: Mike Moody <amvmoody@gmail.com>
Date: Sat, 8 Jul 2017 02:52:27 -0700
Subject: [PATCH] Fixed Icons not being selectable while not highlighted.

---
 scripts/system/edit.js                        | 14 ++++++-------
 .../libraries/entityIconOverlayManager.js     | 21 ++++++++++++++-----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 11ab4771b9..e9afc3a167 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -644,14 +644,12 @@ var toolBar = (function () {
             selectionDisplay.triggerMapping.enable();
             print("starting tablet in landscape mode")
             tablet.landscape = true;
+            entityIconOverlayManager.setIconsSelectable(null,false);
             // Not sure what the following was meant to accomplish, but it currently causes
             // everybody else to think that Interface has lost focus overall. fogbugzid:558
             // Window.setFocus();
         }
-        var activeLightParticle = (isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
-        entityIconOverlayManager.setVisible(activeLightParticle);
-        entityIconOverlayManager.setIconsSelectable(activeLightParticle);
-
+        entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
         Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
     };
 
@@ -944,6 +942,9 @@ function mouseClickEvent(event) {
                 } else {
                     selectionManager.addEntity(foundEntity, true);
                 }
+
+                entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
+
                 if (wantDebug) {
                     print("Model selected: " + foundEntity);
                 }
@@ -1467,10 +1468,7 @@ function handeMenuEvent(menuItem) {
     } else if (menuItem === "Select All Entities Touching Box") {
         selectAllEtitiesInCurrentSelectionBox(true);
     } else if (menuItem === MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) {
-        var activeLightParticle = (isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
-        entityIconOverlayManager.setVisible(activeLightParticle);
-        entityIconOverlayManager.setIconsSelectable(activeLightParticle);
-
+        entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
     } else if (menuItem === MENU_SHOW_ZONES_IN_EDIT_MODE) {
         Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
     }
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index 1953b02d94..a374783b1f 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -1,8 +1,8 @@
 /* globals EntityIconOverlayManager:true */
 
 EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
+
     var visible = false;
-    var iconsSelectable = false;
 
     // List of all created overlays
     var allOverlays = [];
@@ -71,14 +71,25 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
     };
 
 
-    this.setIconsSelectable = function(isIconsSelectable) {
-        if (iconsSelectable !== isIconsSelectable) {
-            iconsSelectable = isIconsSelectable;
+    this.setIconsSelectable = function(arrayOfSelectedEntityIDs, isIconsSelectable) {
+        if (arrayOfSelectedEntityIDs === null) {
             for (var id in entityOverlays) {
                 Overlays.editOverlay(entityOverlays[id], {
-                    ignoreRayIntersection: iconsSelectable
+                    ignoreRayIntersection: isIconsSelectable
                 });
             }
+        } else {
+            for (var id in entityOverlays) {
+                if (arrayOfSelectedEntityIDs.indexOf(id) !== -1) { // in the entityOverlays array and selectable
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: isIconsSelectable
+                    });
+                } else {
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: !isIconsSelectable
+                    });
+                }
+            }
         }
     };