conflicts on file CircularMenuItem.js solved
This commit is contained in:
1 parent
259396c205
commit
b3d9a3cc80
1 file changed
+8
@@ -111,6 +111,10 @@ function newCircularMenuItem() {
|
||||
|
||||
iconPhysics()
|
||||
|
||||
if (thisObject.icon === undefined) {
|
||||
console.log('[ERROR] newCircularMenuItem -> initialize -> err = Icon not found, Action: "' + thisObject.action + '", relatedUiObject: "' + thisObject.relatedUiObject +'", label: "' + thisObject.label + '"')
|
||||
}
|
||||
|
||||
selfMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver)
|
||||
selfMouseClickEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseClick', onMouseClick)
|
||||
selfMouseNotOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseNotOver', onMouseNotOver)
|
||||
@@ -495,6 +499,10 @@ function newCircularMenuItem() {
|
||||
iconSize = UI.projects.foundations.spaces.floatingSpace.style.node.menuItem.imageSize
|
||||
}
|
||||
|
||||
if (thisObject.icon === undefined) {
|
||||
thisObject.icon = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', 'missing-image')
|
||||
}
|
||||
|
||||
if (thisObject.icon !== undefined) {
|
||||
if (thisObject.icon.canDrawIcon === true && thisObject.currentRadius > 1 && thisObject.isDeployed === true) {
|
||||
browserCanvasContext.drawImage(thisObject.icon, menuPosition.x - iconSize, menuPosition.y - iconSize, iconSize * 2, iconSize * 2)
|
||||
|
||||
Reference in new issue
Block a user