From a006868f495be51015360b3a08904584c0180b90 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 30 Mar 2020 15:37:14 +0200 Subject: [PATCH] Aspect Ratio Improved --- ChartingSpace/EdgeEditor.js | 2 +- ChartingSpace/Viewport.js | 4 ++-- FloatingSpace/FloatingObject.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChartingSpace/EdgeEditor.js b/ChartingSpace/EdgeEditor.js index 55f237163..02af47f99 100644 --- a/ChartingSpace/EdgeEditor.js +++ b/ChartingSpace/EdgeEditor.js @@ -109,7 +109,7 @@ function newEdgeEditor () { /* Resize the Time Machine to match the current screen aspect ration */ thisObject.container.parentContainer.frame.width = browserCanvas.width / TIME_MACHINE_WIDTH - thisObject.container.parentContainer.frame.height = (browserCanvas.height - TOP_SPACE_HEIGHT - COCKPIT_SPACE_HEIGHT) / TIME_MACHINE_HEIGHT + thisObject.container.parentContainer.frame.height = (COCKPIT_SPACE_POSITION - TOP_SPACE_HEIGHT) / TIME_MACHINE_HEIGHT coordinateSystem.maxHeight = thisObject.container.parentContainer.frame.height coordinateSystem.maxWidth = thisObject.container.parentContainer.frame.width coordinateSystem.recalculateScale() diff --git a/ChartingSpace/Viewport.js b/ChartingSpace/Viewport.js index 229baa6d2..4f60172be 100644 --- a/ChartingSpace/Viewport.js +++ b/ChartingSpace/Viewport.js @@ -140,7 +140,7 @@ function newViewport () { y: -container.frame.position.y - container.frame.height / 2 } position.x = targetPoint.x + browserCanvas.width / 2 - position.y = targetPoint.y + (browserCanvas.height - COCKPIT_SPACE_HEIGHT - TOP_SPACE_HEIGHT) / 2 + TOP_SPACE_HEIGHT + position.y = targetPoint.y + (COCKPIT_SPACE_POSITION - TOP_SPACE_HEIGHT) / 2 + TOP_SPACE_HEIGHT } function zoomAtCenter (level) { @@ -152,7 +152,7 @@ function newViewport () { function mousePositionPhysics () { if (overrideMousePositionCounter > 0) { thisObject.mousePosition.x = browserCanvas.width / 2 - thisObject.mousePosition.y = (browserCanvas.height - TOP_SPACE_HEIGHT - COCKPIT_SPACE_HEIGHT) / 2 + TOP_SPACE_HEIGHT + thisObject.mousePosition.y = (COCKPIT_SPACE_POSITION - TOP_SPACE_HEIGHT) / 2 + TOP_SPACE_HEIGHT overrideMousePositionCounter-- if (overrideMousePositionCounter < 0) { diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index aedac3068..a57cbefec 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -108,6 +108,7 @@ function newFloatingObject () { } function getContainer (point) { + if (thisObject.payload === undefined) { return } if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return } if (canvas.floatingSpace.inMapMode === true) { return } let container