diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 302d9b4f8..7b0cab182 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -961,8 +961,8 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - targetPoint = canvas.floatingSpace.transformPoointToMap(targetPoint) - position = canvas.floatingSpace.transformPoointToMap(position) + targetPoint = canvas.floatingSpace.transformPointToMap(targetPoint) + position = canvas.floatingSpace.transformPointToMap(position) } if (thisObject.container.frame.radius > 1) { @@ -1036,8 +1036,8 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - position = canvas.floatingSpace.transformPoointToMap(position) - targetPoint = canvas.floatingSpace.transformPoointToMap(targetPoint) + position = canvas.floatingSpace.transformPointToMap(position) + targetPoint = canvas.floatingSpace.transformPointToMap(targetPoint) } let LINE_STYLE = UI_COLOR.GREY @@ -1083,7 +1083,7 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - position = canvas.floatingSpace.transformPoointToMap(position) + position = canvas.floatingSpace.transformPointToMap(position) } let radius = thisObject.container.frame.radius @@ -1127,7 +1127,7 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - position = canvas.floatingSpace.transformPoointToMap(position) + position = canvas.floatingSpace.transformPointToMap(position) } let radius = thisObject.container.frame.radius * 3.5 @@ -1171,7 +1171,7 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - position = canvas.floatingSpace.transformPoointToMap(position) + position = canvas.floatingSpace.transformPointToMap(position) } let radius = thisObject.container.frame.radius * 1.5 @@ -1278,7 +1278,7 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (canvas.floatingSpace.inMapMode === true) { - position = canvas.floatingSpace.transformPoointToMap(position) + position = canvas.floatingSpace.transformPointToMap(position) } let radius = thisObject.container.frame.radius @@ -1294,7 +1294,7 @@ function newUiObject () { visiblePosition = thisObject.container.frame.frameThisPoint(visiblePosition) if (canvas.floatingSpace.inMapMode === true) { - visiblePosition = canvas.floatingSpace.transformPoointToMap(visiblePosition) + visiblePosition = canvas.floatingSpace.transformPointToMap(visiblePosition) } else { visiblePosition = thisObject.fitFunction(visiblePosition) } @@ -1513,4 +1513,3 @@ function newUiObject () { } } } - diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js index 3aaaafaf9..998d308ad 100644 --- a/Spaces/FloatingSpace.js +++ b/Spaces/FloatingSpace.js @@ -12,7 +12,7 @@ function newFloatingSpace () { uiObjectConstructor: undefined, container: undefined, inMapMode: false, - transformPoointToMap: transformPoointToMap, + transformPointToMap: transformPointToMap, oneScreenUp: oneScreenUp, oneScreenDown: oneScreenDown, oneScreenLeft: oneScreenLeft, @@ -81,7 +81,7 @@ function newFloatingSpace () { onDragStartedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onDragStarted', onDragStarted) } - function transformPoointToMap (point) { + function transformPointToMap (point) { let returnPoint = { x: point.x - thisObject.container.frame.position.x, y: point.y - thisObject.container.frame.position.y @@ -91,6 +91,11 @@ function newFloatingSpace () { return returnPoint } + function transformRadiusToMap (radius) { + const RADIUS_REDUCTION_FACTOR = 1 + return radius / RADIUS_REDUCTION_FACTOR + } + function onDoubleClick () { doubleClickCounter = 0