From b37611fda729308f2d0e74fc5bbbff7eb5f5d777 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 16 Mar 2020 09:44:18 +0100 Subject: [PATCH] left right button working well --- Panels/LeftRightButton.js | 9 ++++----- Spaces/PanelsSpace.js | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Panels/LeftRightButton.js b/Panels/LeftRightButton.js index 1ff62802b..cac7c7345 100644 --- a/Panels/LeftRightButton.js +++ b/Panels/LeftRightButton.js @@ -93,14 +93,13 @@ function newLeftRightButton () { } function physics () { - return if (isInitialized === false) { return } - leftPosition.x = thisObject.parentContainer.frame.position.x - leftPosition.y = canvas.chartingSpace.viewport.visibleArea.topRight.y + leftPosition.x = canvas.chartingSpace.viewport.visibleArea.topLeft.x + leftPosition.y = thisObject.parentContainer.frame.position.y - rightPosition.x = thisObject.parentContainer.frame.position.x - rightPosition.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y + rightPosition.x = canvas.chartingSpace.viewport.visibleArea.bottomRight.x + rightPosition.y = thisObject.parentContainer.frame.position.y if (thisObject.status === 'going right') { if (transitionPosition.x < rightPosition.x) { diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js index 45f154f31..4a7dc2dac 100644 --- a/Spaces/PanelsSpace.js +++ b/Spaces/PanelsSpace.js @@ -167,16 +167,32 @@ function newPanelsSpace () { if (panel.upDownButton !== undefined) { if (panel.upDownButton.status === 'up') { - if (centerPoint.x < verticalLine) { - panel.gravitatesTowards = 'topLeft' + if (panel.leftRightButton !== undefined) { + if (panel.leftRightButton.status === 'left') { + panel.gravitatesTowards = 'topLeft' + } else { + panel.gravitatesTowards = 'topRight' + } } else { - panel.gravitatesTowards = 'topRight' + if (centerPoint.x < verticalLine) { + panel.gravitatesTowards = 'topLeft' + } else { + panel.gravitatesTowards = 'topRight' + } } } else { - if (centerPoint.x < verticalLine) { - panel.gravitatesTowards = 'bottomLeft' + if (panel.leftRightButton !== undefined) { + if (panel.leftRightButton.status === 'left') { + panel.gravitatesTowards = 'bottomLeft' + } else { + panel.gravitatesTowards = 'bottomRight' + } } else { - panel.gravitatesTowards = 'bottomRight' + if (centerPoint.x < verticalLine) { + panel.gravitatesTowards = 'bottomLeft' + } else { + panel.gravitatesTowards = 'bottomRight' + } } } } else {