All ready to next phase
This commit is contained in:
1 parent
41685949d7
commit
03c8db171c
4 files changed
+13
-14
No files matched your search
@@ -522,7 +522,7 @@ function newCanvas () {
|
||||
|
||||
/* we check if it is over any of the existing containers at the Chart Space. */
|
||||
|
||||
container = thisObject.chartSpace.getContainer(point)
|
||||
container = thisObject.chartSpace.getContainer(point, GET_CONTAINER_PURPOSE.DRAGGING)
|
||||
|
||||
if (container !== undefined) {
|
||||
if (container.isDraggeable === true) {
|
||||
|
||||
@@ -20,7 +20,7 @@ function newEdgeEditor () {
|
||||
thisObject.container.isDraggeable = true
|
||||
thisObject.container.isClickeable = false
|
||||
thisObject.container.isWheelable = false
|
||||
thisObject.container.detectMouseOver = false // The mouse over event will be detected by the Time Machine, and this container will get it because is connected to its parent.
|
||||
thisObject.container.detectMouseOver = true
|
||||
|
||||
let buttonUsedForDragging
|
||||
let isMouseOver
|
||||
@@ -100,12 +100,15 @@ function newEdgeEditor () {
|
||||
}
|
||||
|
||||
whereIsMouseOver = 'center'
|
||||
if (thisObject.container.isForThisPurpose(purpose) === true) {
|
||||
return thisObject.container
|
||||
switch (purpose) {
|
||||
case GET_CONTAINER_PURPOSE.MOUSE_OVER:
|
||||
return // We will let the Time Machine to handle this situation.
|
||||
break
|
||||
case GET_CONTAINER_PURPOSE.DRAGGING:
|
||||
return thisObject.container
|
||||
break
|
||||
}
|
||||
}
|
||||
isMouseOver = false
|
||||
whereIsMouseOver = 'outside'
|
||||
}
|
||||
|
||||
function physics () {
|
||||
@@ -176,7 +179,7 @@ function newEdgeEditor () {
|
||||
let edgeSize
|
||||
let lineWidth
|
||||
|
||||
if (whereIsMouseOver === 'outside') {
|
||||
if (whereIsMouseOver === 'outside' || isMouseOver === false) {
|
||||
edgeSize = EDGE_SIZE / 2
|
||||
lineWidth = 0.1
|
||||
} else {
|
||||
|
||||
@@ -64,7 +64,7 @@ function newTimeMachine () {
|
||||
thisObject.container = newContainer()
|
||||
thisObject.container.initialize(MODULE_NAME)
|
||||
thisObject.container.fitFunction = thisObject.fitFunction
|
||||
thisObject.container.isDraggeable = true
|
||||
thisObject.container.isDraggeable = false
|
||||
thisObject.container.insideViewport = true
|
||||
thisObject.container.detectMouseOver = true
|
||||
|
||||
@@ -317,7 +317,7 @@ function newTimeMachine () {
|
||||
if (container !== undefined) {
|
||||
return container
|
||||
} else {
|
||||
if (thisObject.container.isForThisPurpose(purpose) === true) {
|
||||
if (thisObject.container.isForThisPurpose(purpose)) {
|
||||
if (thisObject.container.frame.isThisPointHere(point) === true) {
|
||||
return thisObject.container
|
||||
}
|
||||
|
||||
@@ -133,11 +133,7 @@ function newChartSpace () {
|
||||
container = thisObject.timeMachines[i].getContainer(point, purpose)
|
||||
if (container !== undefined) {
|
||||
if (purpose !== undefined) {
|
||||
if (container.isForThisPurpose(purpose)) {
|
||||
if (thisObject.container.frame.isThisPointHere(point, true) === true) {
|
||||
containerFound = container
|
||||
}
|
||||
}
|
||||
containerFound = container
|
||||
} else {
|
||||
if (thisObject.container.frame.isThisPointHere(point, true) === true) {
|
||||
containerFound = container
|
||||
|
||||
Reference in new issue
Block a user