Bug Fixed: pinned icon now working

This commit is contained in:
Luis Fernando Molina committed 2019-05-24 12:48:57 +02:00
1 parent 57df515f60
commit 5ce0bdb4a6
4 files changed
+24

No files matched your search

+1
View File
@@ -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
+8
View File
@@ -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) {
+5
View File
@@ -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
+10
View File
@@ -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,