From 5ce0bdb4a6ce79f51ec9f70ab357bb04cc7b209e Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Fri, 24 May 2019 12:48:57 +0200
Subject: [PATCH] Bug Fixed: pinned icon now working

---
 FloatingSpace/CircularMenu.js            |  1 +
 FloatingSpace/CircularMenuItem.js        |  8 ++++++++
 FloatingSpace/FloatingObject.js          |  5 +++++
 FloatingSpace/StrategyPartConstructor.js | 10 ++++++++++
 4 files changed, 24 insertions(+)

diff --git a/FloatingSpace/CircularMenu.js b/FloatingSpace/CircularMenu.js
index 89113c067..5a6c96be7 100644
--- a/FloatingSpace/CircularMenu.js
+++ b/FloatingSpace/CircularMenu.js
@@ -52,6 +52,7 @@ function newCircularMenu () {
 
       menuItem.action = menuItemInitialValue.action
       menuItem.actionFunction = menuItemInitialValue.actionFunction
+      menuItem.actionStatus = menuItemInitialValue.actionStatus
       menuItem.label = menuItemInitialValue.label
       menuItem.workingLabel = menuItemInitialValue.workingLabel
       menuItem.workDoneLabel = menuItemInitialValue.workDoneLabel
diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js
index b4f191322..cbda91bc9 100644
--- a/FloatingSpace/CircularMenuItem.js
+++ b/FloatingSpace/CircularMenuItem.js
@@ -10,6 +10,7 @@ function newCircularMenuItem () {
     currentIcon: undefined,
     action: undefined,
     actionFunction: undefined,
+    actionStatus: undefined,
     label: undefined,
     workingLabel: undefined,
     workDoneLabel: undefined,
@@ -70,6 +71,7 @@ function newCircularMenuItem () {
     thisObject.currentIcon = undefined
     thisObject.payload = undefined
     thisObject.actionFunction = undefined
+    thisObject.actionStatus = undefined
   }
 
   function initialize (pPayload) {
@@ -140,6 +142,12 @@ function newCircularMenuItem () {
       thisObject.iconOff = canvas.strategySpace.iconCollection.get(thisObject.iconPathOff)
     }
 
+    /* Current Status might be linked to some other object status */
+
+    if (thisObject.actionStatus !== undefined) {
+      thisObject.currentStatus = thisObject.actionStatus()
+    }
+
     /* Current Status sets the icon to be used */
 
     if (thisObject.currentStatus === true) {
diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js
index 53e612b2f..6bc85f59d 100644
--- a/FloatingSpace/FloatingObject.js
+++ b/FloatingSpace/FloatingObject.js
@@ -20,6 +20,7 @@ function newFloatingObject () {
     rawRadius: 0,                           // This is the radius of this floating object without zoom.
     targetRadius: 0,                        // This is the target radius of the floating object with zoom applied. It should be animated until reaching this value.
     isPinned: false,
+    getPinStatus: getPinStatus,
     nearbyFloatingObjects: [],
     setPosition: setPosition,
     pinToggle: pinToggle,
@@ -100,6 +101,10 @@ function newFloatingObject () {
     }
   }
 
+  function getPinStatus () {
+    return thisObject.isPinned
+  }
+
   function pinToggle () {
     if (thisObject.isPinned !== true) {
       thisObject.isPinned = true
diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index 88701ae54..bee92f260 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -74,6 +74,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: true,
             label: undefined,
             visible: false,
@@ -131,6 +132,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -172,6 +174,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -214,6 +217,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -256,6 +260,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -298,6 +303,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -340,6 +346,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -387,6 +394,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -454,6 +462,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,
@@ -513,6 +522,7 @@ function newStrategyPartConstructor () {
           {
             action: 'Pin / Unpin',
             actionFunction: floatingObject.pinToggle,
+            actionStatus: floatingObject.getPinStatus,
             currentStatus: false,
             label: undefined,
             visible: false,