From ca54f8635cd054673ff4943baefa1c68f2d221a8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 13 May 2019 15:08:50 +0200 Subject: [PATCH] Putting the red lines inside the bottom space --- Globals.js | 2 +- Spaces/BottomSpace.js | 5 +++-- Spaces/FloatingSpace.js | 10 +++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Globals.js b/Globals.js index d3b973c71..77d9ed28c 100644 --- a/Globals.js +++ b/Globals.js @@ -163,7 +163,7 @@ const MIN_PLOTABLE_DATE = new Date(2015, 0, 1, 0, 0, 0); const MAX_PLOTABLE_DATE = maxDate; const TOP_SPACE_HEIGHT = 5; -const BOTTOM_SPACE_HEIGHT = 35; +const BOTTOM_SPACE_HEIGHT = 40; const BREAKPOINT_HEIGHT = 15; const SIDE_PANEL_WIDTH = 450 let BOTTOM_SPACE_POSITION = browserCanvas.height - BOTTOM_SPACE_HEIGHT diff --git a/Spaces/BottomSpace.js b/Spaces/BottomSpace.js index 3e03f4c77..3bee0df9d 100644 --- a/Spaces/BottomSpace.js +++ b/Spaces/BottomSpace.js @@ -200,13 +200,13 @@ browserCanvasContext.fill() browserCanvasContext.beginPath() - browserCanvasContext.rect(zeroPoint.x, zeroPoint.y - RED_LINE_HIGHT, thisObject.container.frame.width, RED_LINE_HIGHT) + browserCanvasContext.rect(zeroPoint.x, zeroPoint.y, thisObject.container.frame.width, RED_LINE_HIGHT) browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', ' + opacity + ')' browserCanvasContext.closePath() browserCanvasContext.fill() browserCanvasContext.beginPath() - browserCanvasContext.rect(zeroPoint.x, zeroPoint.y + thisObject.container.frame.height, thisObject.container.frame.width, RED_LINE_HIGHT) + browserCanvasContext.rect(zeroPoint.x, zeroPoint.y - RED_LINE_HIGHT + thisObject.container.frame.height, thisObject.container.frame.width, RED_LINE_HIGHT) browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', ' + opacity + ')' browserCanvasContext.closePath() browserCanvasContext.fill() @@ -305,3 +305,4 @@ browserCanvasContext.stroke() } } + diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js index d160d6bc8..32752e594 100644 --- a/Spaces/FloatingSpace.js +++ b/Spaces/FloatingSpace.js @@ -66,8 +66,6 @@ function newFloatingSpace () { function fitIntoVisibleArea (point) { /* Here we check the boundaries of the resulting points, so they dont go out of the visible area. */ - const RED_LINE = 5 - let returnPoint = { x: point.x, y: point.y @@ -81,8 +79,8 @@ function newFloatingSpace () { returnPoint.x = 0 } - if (point.y < BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT + RED_LINE) { - returnPoint.y = BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT + RED_LINE + if (point.y < BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT) { + returnPoint.y = BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT } if (point.y > browserCanvas.height) { @@ -93,8 +91,6 @@ function newFloatingSpace () { } function isThisPointVisible (point) { - const RED_LINE = 5 - if (point.x > browserCanvas.width) { return false } @@ -103,7 +99,7 @@ function newFloatingSpace () { return false } - if (point.y < BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT + RED_LINE) { + if (point.y < BOTTOM_SPACE_POSITION + BOTTOM_SPACE_HEIGHT) { return false }